From 303df626a2b367bba99eb69f27306472f3ea1bb3 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 1 Oct 2017 10:55:43 -0700 Subject: [PATCH] Depend on wpiutil 3.+ rather than just +. (#235) Also update to wpilib-version-plugin 2.0. --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index fd23a92473..900199e1a2 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { classpath 'gradle.plugin.edu.wpi.first:native-utils:1.2.9' - classpath 'gradle.plugin.edu.wpi.first.wpilib.versioning:wpilib-version-plugin:1.6' + classpath 'gradle.plugin.edu.wpi.first.wpilib.versioning:wpilib-version-plugin:2.0' } } @@ -78,10 +78,10 @@ build.dependsOn devClasses dependencies { - compile 'edu.wpi.first.wpiutil:wpiutil-java:+' + compile 'edu.wpi.first.wpiutil:wpiutil-java:3.+' testCompile 'junit:junit:4.12' testRuntime files(project(':').nativeTestFilesJar.archivePath) - devCompile 'edu.wpi.first.wpiutil:wpiutil-java:+' + devCompile 'edu.wpi.first.wpiutil:wpiutil-java:3.+' devCompile sourceSets.main.output devRuntime files(project(':').nativeTestFilesJar.archivePath) } @@ -138,7 +138,7 @@ model { artifactId = 'wpiutil-cpp' headerClassifier = 'headers' ext = 'zip' - version = '+' + version = '3.+' sharedConfigs = [ ntcore: [], ntcoreDev: [], ntcoreTestingBaseTest: [] ]