From 7fab0e0ef2ea427bc986666e5346c026a3a73bd2 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 1 Oct 2017 10:57:03 -0700 Subject: [PATCH] Depend on wpiutil 3.+, ntcore 4.+, cscore 1.+ rather than just +. (#651) Also update to wpilib-version-plugin 2.0. --- build.gradle | 2 +- hal/build.gradle | 2 +- wpilibc-examples/build.gradle | 6 +++--- wpilibc/build.gradle | 6 +++--- wpilibcIntegrationTests/build.gradle | 6 +++--- wpilibj/build.gradle | 22 +++++++++++----------- wpilibjIntegrationTests/build.gradle | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index e87e00ea16..330e17cd90 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { plugins { id 'net.ltgt.errorprone' version '0.0.10' - id 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' version '1.6' + id 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' version '2.0' } ext.licenseFile = file("$rootDir/license.txt") diff --git a/hal/build.gradle b/hal/build.gradle index 48aa2552cd..c349a61f91 100644 --- a/hal/build.gradle +++ b/hal/build.gradle @@ -31,7 +31,7 @@ model { artifactId = 'wpiutil-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '3.+' sharedConfigs = [ halAthena: [], halSim: [], halDev: [], halSimTestingBaseTest: [] ] staticConfigs = [ halSimStaticDeps: [] ] } diff --git a/wpilibc-examples/build.gradle b/wpilibc-examples/build.gradle index c74715118e..1164d3abae 100644 --- a/wpilibc-examples/build.gradle +++ b/wpilibc-examples/build.gradle @@ -21,7 +21,7 @@ if (!project.hasProperty('skipAthena')) { artifactId = 'wpiutil-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '3.+' sharedConfigs = examplesMap } ntcore(DependencyConfig) { @@ -29,7 +29,7 @@ if (!project.hasProperty('skipAthena')) { artifactId = 'ntcore-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '4.+' sharedConfigs = examplesMap } opencv(DependencyConfig) { @@ -45,7 +45,7 @@ if (!project.hasProperty('skipAthena')) { artifactId = 'cscore-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '1.+' sharedConfigs = examplesMap } } diff --git a/wpilibc/build.gradle b/wpilibc/build.gradle index 10340afcd4..20d6ae75f1 100644 --- a/wpilibc/build.gradle +++ b/wpilibc/build.gradle @@ -65,7 +65,7 @@ model { artifactId = 'wpiutil-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '3.+' sharedConfigs = [ wpilibc: [], wpilibcTestingBaseTest: [], wpilibcDev: [] ] @@ -75,7 +75,7 @@ model { artifactId = 'ntcore-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '4.+' sharedConfigs = [ wpilibc: [], wpilibcTestingBaseTest: [], wpilibcDev: [] ] @@ -95,7 +95,7 @@ model { artifactId = 'cscore-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '1.+' sharedConfigs = [ wpilibc: [], wpilibcTestingBaseTest: [], wpilibcDev: [] ] diff --git a/wpilibcIntegrationTests/build.gradle b/wpilibcIntegrationTests/build.gradle index b36540c415..ba5b6937be 100644 --- a/wpilibcIntegrationTests/build.gradle +++ b/wpilibcIntegrationTests/build.gradle @@ -14,7 +14,7 @@ if (!project.hasProperty('skipAthena')) { artifactId = 'wpiutil-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '3.+' sharedConfigs = [ wpilibcIntegrationTests: [] ] } ntcore(DependencyConfig) { @@ -22,7 +22,7 @@ if (!project.hasProperty('skipAthena')) { artifactId = 'ntcore-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '4.+' sharedConfigs = [ wpilibcIntegrationTests: [] ] } opencv(DependencyConfig) { @@ -38,7 +38,7 @@ if (!project.hasProperty('skipAthena')) { artifactId = 'cscore-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '1.+' sharedConfigs = [ wpilibcIntegrationTests: [] ] } } diff --git a/wpilibj/build.gradle b/wpilibj/build.gradle index d18be4f2c9..81308c8ace 100644 --- a/wpilibj/build.gradle +++ b/wpilibj/build.gradle @@ -107,26 +107,26 @@ pmd { } dependencies { - compile 'edu.wpi.first.wpiutil:wpiutil-java:+' - compile 'edu.wpi.first.ntcore:ntcore-java:+' + compile 'edu.wpi.first.wpiutil:wpiutil-java:3.+' + compile 'edu.wpi.first.ntcore:ntcore-java:4.+' compile 'org.opencv:opencv-java:3.2.0' - compile 'edu.wpi.first.cscore:cscore-java:+' + compile 'edu.wpi.first.cscore:cscore-java:1.+' testCompile 'org.hamcrest:hamcrest-all:1.3' testCompile 'junit:junit:4.12' testCompile 'com.google.guava:guava:19.0' testRuntime files(project.nativeTestFilesJar.archivePath) - testRuntime 'edu.wpi.first.ntcore:ntcore-jni:+:all' + testRuntime 'edu.wpi.first.ntcore:ntcore-jni:4.+:all' testRuntime 'org.opencv:opencv-jni:3.2.0:all' - testRuntime 'edu.wpi.first.cscore:cscore-jni:+:all' - devCompile 'edu.wpi.first.wpiutil:wpiutil-java:+' - devCompile 'edu.wpi.first.ntcore:ntcore-java:+' + testRuntime 'edu.wpi.first.cscore:cscore-jni:1.+:all' + devCompile 'edu.wpi.first.wpiutil:wpiutil-java:3.+' + devCompile 'edu.wpi.first.ntcore:ntcore-java:4.+' devCompile 'org.opencv:opencv-java:3.2.0' - devCompile 'edu.wpi.first.cscore:cscore-java:+' + devCompile 'edu.wpi.first.cscore:cscore-java:1.+' devCompile sourceSets.main.output devRuntime files(project.nativeTestFilesJar.archivePath) - devRuntime 'edu.wpi.first.ntcore:ntcore-jni:+:all' + devRuntime 'edu.wpi.first.ntcore:ntcore-jni:4.+:all' devRuntime 'org.opencv:opencv-jni:3.2.0:all' - devRuntime 'edu.wpi.first.cscore:cscore-jni:+:all' + devRuntime 'edu.wpi.first.cscore:cscore-jni:1.+:all' } def jniClasses = [ @@ -220,7 +220,7 @@ model { artifactId = 'wpiutil-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '3.+' sharedConfigs = [ wpilibJNIShared: [] ] staticConfigs = [ wpilibJNIStatic: [] ] } diff --git a/wpilibjIntegrationTests/build.gradle b/wpilibjIntegrationTests/build.gradle index 32b3078617..865b801470 100644 --- a/wpilibjIntegrationTests/build.gradle +++ b/wpilibjIntegrationTests/build.gradle @@ -13,10 +13,10 @@ mainClassName = 'edu.wpi.first.wpilibj.test.AntJunitLanucher' dependencies { compile project(':wpilibj') compile files(project(':wpilibj').sourceSets.test.output) - compile 'edu.wpi.first.wpiutil:wpiutil-java:+' - compile 'edu.wpi.first.ntcore:ntcore-java:+' + compile 'edu.wpi.first.wpiutil:wpiutil-java:3.+' + compile 'edu.wpi.first.ntcore:ntcore-java:4.+' compile 'org.opencv:opencv-java:3.2.0' - compile 'edu.wpi.first.cscore:cscore-java:+' + compile 'edu.wpi.first.cscore:cscore-java:1.+' compile 'junit:junit:4.11' compile 'com.googlecode.junit-toolbox:junit-toolbox:2.0' compile 'org.apache.ant:ant:1.9.4'