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

Update NI Library to 2019.7.1 and OpenCV to 3.4.3-16 (#1418)

Browse Source 
Add def for each to eliminate duplication of version number.
This commit is contained in:
Thad House
2018-11-09 19:59:06 -08:00
committed by Peter Johnson
parent 8be693f55d
commit 7c9a3c4d77
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shared/nilibraries.gradle
View File

@@ -9,6 +9,8 @@ project.netCommComponents.each { String s->
netCommLibConfigs[s] = ['linux:athena']
}
def niLibrariesVersion = '2019.7.1'
model {
dependencyConfigs {
chipobject(DependencyConfig) {
@@ -16,7 +18,7 @@ model {
artifactId = 'chipobject'
headerClassifier = 'headers'
ext = 'zip'
version = '2019.4.2'
version = niLibrariesVersion
sharedConfigs = chipObjectConfigs
staticConfigs = [:]
compileOnlyShared = true
@@ -26,7 +28,7 @@ model {
artifactId = 'netcomm'
headerClassifier = 'headers'
ext = 'zip'
version = '2019.4.2'
version = niLibrariesVersion
sharedConfigs = netCommLibConfigs
staticConfigs = [:]
compileOnlyShared = true

10
shared/opencv.gradle
View File

@@ -1,3 +1,5 @@
def opencvVersion = '3.4.3-16'
if (project.hasProperty('useCpp') && project.useCpp) {
model {
dependencyConfigs {
@@ -6,7 +8,7 @@ if (project.hasProperty('useCpp') && project.useCpp) {
artifactId = 'opencv-cpp'
headerClassifier = 'headers'
ext = 'zip'
version = '3.4.3-15'
version = opencvVersion
sharedConfigs = project.sharedCvConfigs
staticConfigs = project.staticCvConfigs
linkExcludes = ['**/*java*']
@@ -17,12 +19,12 @@ if (project.hasProperty('useCpp') && project.useCpp) {
if (project.hasProperty('useJava') && project.useJava) {
dependencies {
compile 'edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:3.4.3-15'
compile "edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:${opencvVersion}"
if (!project.hasProperty('skipDev') || !project.skipDev) {
devCompile 'edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:3.4.3-15'
devCompile "edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:${opencvVersion}"
}
if (project.hasProperty('useDocumentation') && project.useDocumentation) {
javaSource 'edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:3.4.3-15:sources'
javaSource "edu.wpi.first.thirdparty.frc2019.opencv:opencv-java:${opencvVersion}:sources"
}
}
}