Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-06 03:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump OpenCV and GTest to 2019 dependencies (#1366)

Browse Source
This commit is contained in:
Thad House
2018-10-13 20:46:14 -07:00
committed by Peter Johnson
parent bd9484a2f4
commit 7068551a3e
4 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/googletest.gradle
View File

@@ -1,7 +1,7 @@
model {
dependencyConfigs {
googletest(DependencyConfig) {
groupId = 'edu.wpi.first.thirdparty.frc2018'
groupId = 'edu.wpi.first.thirdparty.frc2019'
artifactId = 'googletest'
headerClassifier = 'headers'
ext = 'zip'

11
shared/opencv.gradle
View File

@@ -2,13 +2,14 @@ if (project.hasProperty('useCpp') && project.useCpp) {
model {
dependencyConfigs {
opencv(DependencyConfig) {
groupId = 'org.opencv'
groupId = 'edu.wpi.first.thirdparty.frc2019.opencv'
artifactId = 'opencv-cpp'
headerClassifier = 'headers'
ext = 'zip'
version = '3.2.0'
version = '3.4.3-7'
sharedConfigs = project.sharedCvConfigs
staticConfigs = project.staticCvConfigs
linkExcludes = ['**/*java*']
}
}
}
@@ -16,12 +17,12 @@ if (project.hasProperty('useCpp') && project.useCpp) {
if (project.hasProperty('useJava') && project.useJava) {
dependencies {
compile 'org.opencv:opencv-java:3.2.0'
compile 'edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:3.4.3-7'
if (!project.hasProperty('skipDev') || !project.skipDev) {
devCompile 'org.opencv:opencv-java:3.2.0'
devCompile 'edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:3.4.3-7'
}
if (project.hasProperty('useDocumentation') && project.useDocumentation) {
javaSource 'org.opencv:opencv-java:3.2.0:sources'
javaSource 'edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:3.4.3-7:sources'
}
}
}