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

Depend on wpiutil 3.+ rather than just +. (#95)

Browse Source 
Also update to wpilib-version-plugin 2.0.
This commit is contained in:
Peter Johnson
2017-10-01 10:56:21 -07:00
committed by GitHub
parent db96f41ad7
commit 223e61df2a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@@ -12,7 +12,7 @@ buildscript {
}
dependencies {
classpath 'gradle.plugin.edu.wpi.first:native-utils:1.2.12'
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,12 +78,12 @@ run.dependsOn nativeTestFilesJar
build.dependsOn devClasses
dependencies {
compile 'edu.wpi.first.wpiutil:wpiutil-java:+'
compile 'edu.wpi.first.wpiutil:wpiutil-java:3.+'
compile 'org.opencv:opencv-java:3.2.0'
testCompile 'junit:junit:4.12'
testRuntime files(project(':').nativeTestFilesJar.archivePath)
testRuntime 'org.opencv:opencv-jni:3.2.0:all'
devCompile 'edu.wpi.first.wpiutil:wpiutil-java:+'
devCompile 'edu.wpi.first.wpiutil:wpiutil-java:3.+'
devCompile 'org.opencv:opencv-java:3.2.0'
devCompile sourceSets.main.output
devRuntime files(project(':').nativeTestFilesJar.archivePath)
@@ -142,7 +142,7 @@ model {
artifactId = 'wpiutil-cpp'
headerClassifier = 'headers'
ext = 'zip'
version = '+'
version = '3.+'
sharedConfigs = [ cscore: [],
cscoreDev: [],
cscoreTestingBaseTest: [] ]