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

Depend on wpiutil 3.+, ntcore 4.+, cscore 1.+ rather than just +. (#651)

Browse Source 
Also update to wpilib-version-plugin 2.0.
This commit is contained in:
Peter Johnson
2017-10-01 10:57:03 -07:00
committed by GitHub
parent dd66b23845
commit 7fab0e0ef2
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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")

2
hal/build.gradle
View File

@@ -31,7 +31,7 @@ model {
artifactId = 'wpiutil-cpp'
headerClassifier = 'headers'
ext = 'zip'
version = '+'
version = '3.+'
sharedConfigs = [ halAthena: [], halSim: [], halDev: [], halSimTestingBaseTest: [] ]
staticConfigs = [ halSimStaticDeps: [] ]
}

6
wpilibc-examples/build.gradle
View File

@@ -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
}
}

6
wpilibc/build.gradle
View File

@@ -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: [] ]

6
wpilibcIntegrationTests/build.gradle
View File

@@ -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: [] ]
}
}

22
wpilibj/build.gradle
View File

@@ -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: [] ]
}

6
wpilibjIntegrationTests/build.gradle
View File

@@ -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'