diff --git a/build.gradle b/build.gradle index 8841439a5f..9eec720e85 100644 --- a/build.gradle +++ b/build.gradle @@ -3,15 +3,14 @@ import edu.wpi.first.toolchain.* plugins { id 'base' id 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' version '4.0.1' - id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.1' + id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2' id 'edu.wpi.first.NativeUtils' apply false - id 'edu.wpi.first.GradleJni' version '0.9.1' - id 'edu.wpi.first.GradleVsCode' version '0.9.6' + id 'edu.wpi.first.GradleJni' version '0.10.1' + id 'edu.wpi.first.GradleVsCode' version '0.10.0' id 'idea' id 'visual-studio' - id 'com.gradle.build-scan' version '2.3' - id 'net.ltgt.errorprone' version '0.6' apply false - id 'com.github.johnrengelman.shadow' version '4.0.3' apply false + id 'net.ltgt.errorprone' version '1.1.1' apply false + id 'com.github.johnrengelman.shadow' version '5.2.0' apply false } if (project.hasProperty('buildServer')) { @@ -111,5 +110,5 @@ ext.getCurrentArch = { } wrapper { - gradleVersion = '5.4.1' + gradleVersion = '6.0' } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 0e8e717980..c3674f45fd 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -5,5 +5,5 @@ repositories { } } dependencies { - compile "edu.wpi.first:native-utils:2020.1.5" + implementation "edu.wpi.first:native-utils:2020.5.1" } diff --git a/cameraserver/build.gradle b/cameraserver/build.gradle index d59d74983d..2f864d9350 100644 --- a/cameraserver/build.gradle +++ b/cameraserver/build.gradle @@ -10,12 +10,12 @@ evaluationDependsOn(':hal') apply from: "${rootDir}/shared/javacpp/setupBuild.gradle" dependencies { - compile project(':wpiutil') - compile project(':ntcore') - compile project(':cscore') - devCompile project(':wpiutil') - devCompile project(':ntcore') - devCompile project(':cscore') + implementation project(':wpiutil') + implementation project(':ntcore') + implementation project(':cscore') + devImplementation project(':wpiutil') + devImplementation project(':ntcore') + devImplementation project(':cscore') } ext { diff --git a/cameraserver/multiCameraServer/build.gradle b/cameraserver/multiCameraServer/build.gradle index c49cfb00c3..88a6f0e225 100644 --- a/cameraserver/multiCameraServer/build.gradle +++ b/cameraserver/multiCameraServer/build.gradle @@ -27,12 +27,12 @@ repositories { } dependencies { - compile 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.5' - compile project(':wpiutil') - compile project(':ntcore') - compile project(':cscore') - compile project(':cameraserver') + implementation project(':wpiutil') + implementation project(':ntcore') + implementation project(':cscore') + implementation project(':cameraserver') } model { diff --git a/docs/build.gradle b/docs/build.gradle index d746fe786e..05053077e7 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -75,8 +75,8 @@ doxygen { } tasks.register("zipCppDocs", Zip) { - baseName = zipBaseNameCpp - destinationDir = outputsFolder + archiveBaseName = zipBaseNameCpp + destinationDirectory = outputsFolder dependsOn doxygen from ("$buildDir/docs/doxygen/html") into '/' @@ -136,8 +136,8 @@ task generateJavaDocs(type: Javadoc) { } tasks.register("zipJavaDocs", Zip) { - baseName = zipBaseNameJava - destinationDir = outputsFolder + archiveBaseName = zipBaseNameJava + destinationDirectory = outputsFolder dependsOn generateJavaDocs from ("$buildDir/docs/javadoc") into '/' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf016..cc4fdc293d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4d7b2bf61..6ce793f21e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0ab5d..2fe81a7d95 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -125,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -154,19 +154,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 15e1ee37a7..24467a141f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS, diff --git a/myRobot/build.gradle b/myRobot/build.gradle index d12c523486..16be7e5be3 100644 --- a/myRobot/build.gradle +++ b/myRobot/build.gradle @@ -36,14 +36,14 @@ repositories { } dependencies { - compile project(':wpilibj') - compile project(':hal') - compile project(':wpiutil') - compile project(':ntcore') - compile project(':cscore') - compile project(':cameraserver') - compile project(':wpilibOldCommands') - compile project(':wpilibNewCommands') + implementation project(':wpilibj') + implementation project(':hal') + implementation project(':wpiutil') + implementation project(':ntcore') + implementation project(':cscore') + implementation project(':cameraserver') + implementation project(':wpilibOldCommands') + implementation project(':wpilibNewCommands') } jar { diff --git a/settings.gradle b/settings.gradle index 73ef0e8c73..084cf5e818 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,10 @@ pluginManagement { } } +plugins { + id "com.gradle.enterprise" version "3.0" +} + // Set the flag to tell gradle to ignore unresolved headers // Libraries like eigen and opencv use macro includes, which // Gradle doesn't properly ignore, and completely disables diff --git a/shared/config.gradle b/shared/config.gradle index 017309727e..47dba5b62d 100644 --- a/shared/config.gradle +++ b/shared/config.gradle @@ -90,9 +90,9 @@ ext.createComponentZipTasks = { components, names, base, type, project, func -> configMap.each { key, value -> def task = project.tasks.create(base + "-${key}", type) { description = 'Creates component archive for platform ' + key - destinationDir = outputsFolder + destinationDirectory = outputsFolder classifier = key - baseName = '_M_' + base + archiveBaseName = '_M_' + base duplicatesStrategy = 'exclude' from(licenseFile) { diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle index 4ade36940f..d83ead2c6e 100644 --- a/shared/java/javacommon.gradle +++ b/shared/java/javacommon.gradle @@ -1,5 +1,5 @@ apply plugin: 'maven-publish' -apply plugin: 'java' +apply plugin: 'java-library' //apply plugin: 'net.ltgt.errorprone' apply plugin: 'jacoco' @@ -20,21 +20,21 @@ task javadocJar(type: Jar, dependsOn: javadoc) { } task outputJar(type: Jar, dependsOn: classes) { - baseName javaBaseName - destinationDir outputsFolder + archiveBaseName = javaBaseName + destinationDirectory = outputsFolder from sourceSets.main.output } task outputSourcesJar(type: Jar, dependsOn: classes) { - baseName javaBaseName - destinationDir outputsFolder + archiveBaseName = javaBaseName + destinationDirectory = outputsFolder classifier = 'sources' from sourceSets.main.allSource } task outputJavadocJar(type: Jar, dependsOn: javadoc) { - baseName javaBaseName - destinationDir outputsFolder + archiveBaseName = javaBaseName + destinationDirectory = outputsFolder classifier = 'javadoc' from javadoc.destinationDir } @@ -104,7 +104,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-params:5.4.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2' - devCompile sourceSets.main.output + devImplementation sourceSets.main.output //errorprone 'com.google.errorprone:error_prone_core:2.3.2-SNAPSHOT' //errorproneJavac 'com.google.errorprone:error_prone_core:2.3.1' diff --git a/shared/java/javastyle.gradle b/shared/java/javastyle.gradle index 6e4e2611ad..eec3796ab9 100644 --- a/shared/java/javastyle.gradle +++ b/shared/java/javastyle.gradle @@ -3,8 +3,8 @@ apply plugin: 'checkstyle' checkstyle { toolVersion = "8.12" - configDir = file("${project.rootDir}/styleguide") - config = resources.text.fromFile(new File(configDir, "checkstyle.xml")) + configDirectory = file("${project.rootDir}/styleguide") + config = resources.text.fromFile(new File(configDirectory.get().getAsFile(), "checkstyle.xml")) } if (!project.hasProperty('skipPMD')) { diff --git a/shared/javacpp/publish.gradle b/shared/javacpp/publish.gradle index 1dafcbb5ae..5002def737 100644 --- a/shared/javacpp/publish.gradle +++ b/shared/javacpp/publish.gradle @@ -9,8 +9,8 @@ def zipBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-cpp_CLS" def licenseFile = file("$rootDir/license.txt") task cppSourcesZip(type: Zip) { - destinationDir = outputsFolder - baseName = zipBaseName + destinationDirectory = outputsFolder + archiveBaseName = zipBaseName classifier = "sources" from(licenseFile) { @@ -23,8 +23,8 @@ task cppSourcesZip(type: Zip) { } task cppHeadersZip(type: Zip) { - destinationDir = outputsFolder - baseName = zipBaseName + destinationDirectory = outputsFolder + archiveBaseName = zipBaseName classifier = "headers" from(licenseFile) { diff --git a/shared/jni/publish.gradle b/shared/jni/publish.gradle index e50f87e15e..765302a086 100644 --- a/shared/jni/publish.gradle +++ b/shared/jni/publish.gradle @@ -11,8 +11,8 @@ def jniBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-jni_CLS" def licenseFile = file("$rootDir/license.txt") task cppSourcesZip(type: Zip) { - destinationDir = outputsFolder - baseName = zipBaseName + destinationDirectory = outputsFolder + archiveBaseName = zipBaseName classifier = "sources" duplicatesStrategy = 'exclude' @@ -41,8 +41,8 @@ task cppSourcesZip(type: Zip) { } task cppHeadersZip(type: Zip) { - destinationDir = outputsFolder - baseName = zipBaseName + destinationDirectory = outputsFolder + archiveBaseName = zipBaseName classifier = "headers" from(licenseFile) { diff --git a/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle index 35f4cf2d06..a97f378a44 100644 --- a/shared/jni/setupBuild.gradle +++ b/shared/jni/setupBuild.gradle @@ -17,8 +17,8 @@ apply from: "${rootDir}/shared/java/javacommon.gradle" dependencies { if (!project.hasProperty('noWpiutil')) { - compile project(':wpiutil') - devCompile project(':wpiutil') + implementation project(':wpiutil') + devImplementation project(':wpiutil') } } diff --git a/shared/opencv.gradle b/shared/opencv.gradle index 7a1dd0f3ab..ca3764d2d6 100644 --- a/shared/opencv.gradle +++ b/shared/opencv.gradle @@ -22,9 +22,9 @@ if (project.hasProperty('useCpp') && project.useCpp) { if (project.hasProperty('useJava') && project.useJava) { dependencies { - compile "edu.wpi.first.thirdparty.frc2020.opencv:opencv-java:${opencvVersion}" + implementation "edu.wpi.first.thirdparty.frc2020.opencv:opencv-java:${opencvVersion}" if (!project.hasProperty('skipDev') || !project.skipDev) { - devCompile "edu.wpi.first.thirdparty.frc2020.opencv:opencv-java:${opencvVersion}" + devImplementation "edu.wpi.first.thirdparty.frc2020.opencv:opencv-java:${opencvVersion}" } if (project.hasProperty('useDocumentation') && project.useDocumentation) { javaSource "edu.wpi.first.thirdparty.frc2020.opencv:opencv-java:${opencvVersion}:sources" diff --git a/shared/plugins/publish.gradle b/shared/plugins/publish.gradle index 6f318b7829..ec160ed9d5 100644 --- a/shared/plugins/publish.gradle +++ b/shared/plugins/publish.gradle @@ -7,8 +7,8 @@ def zipBaseName = "_GROUP_edu_wpi_first_halsim_ID_${pluginName}_CLS" def outputsFolder = file("$project.buildDir/outputs") task cppSourcesZip(type: Zip) { - destinationDir = outputsFolder - baseName = zipBaseName + destinationDirectory = outputsFolder + archiveBaseName = zipBaseName classifier = "sources" from(licenseFile) { @@ -21,8 +21,8 @@ task cppSourcesZip(type: Zip) { } task cppHeadersZip(type: Zip) { - destinationDir = outputsFolder - baseName = zipBaseName + destinationDirectory = outputsFolder + archiveBaseName = zipBaseName classifier = "headers" from(licenseFile) { diff --git a/simulation/gz_msgs/build.gradle b/simulation/gz_msgs/build.gradle index c9ebf3599c..353f4ad204 100644 --- a/simulation/gz_msgs/build.gradle +++ b/simulation/gz_msgs/build.gradle @@ -44,8 +44,8 @@ tasks.whenTaskAdded { task -> } dependencies { - compile "com.google.protobuf:protobuf-java:${protobuf_version}" - compile "com.google.protobuf:protoc:${protobuf_version}" + implementation "com.google.protobuf:protobuf-java:${protobuf_version}" + implementation "com.google.protobuf:protoc:${protobuf_version}" } /* There is a nice gradle plugin for protobuf, and the protoc tool diff --git a/simulation/lowfi_simulation/publish.gradle b/simulation/lowfi_simulation/publish.gradle index 9a3204e3fe..1fa3aafbfc 100644 --- a/simulation/lowfi_simulation/publish.gradle +++ b/simulation/lowfi_simulation/publish.gradle @@ -7,8 +7,8 @@ def zipBaseName = "_GROUP_edu_wpi_first_halsim_ID_${nativeName}_CLS" def outputsFolder = file("$project.buildDir/outputs") task cppSourcesZip(type: Zip) { - destinationDir = outputsFolder - baseName = zipBaseName + destinationDirectory = outputsFolder + archiveBaseName = zipBaseName classifier = "sources" from(licenseFile) { @@ -21,8 +21,8 @@ task cppSourcesZip(type: Zip) { } task cppHeadersZip(type: Zip) { - destinationDir = outputsFolder - baseName = zipBaseName + destinationDirectory = outputsFolder + archiveBaseName = zipBaseName classifier = "headers" from(licenseFile) { diff --git a/wpilibNewCommands/build.gradle b/wpilibNewCommands/build.gradle index ec4e111197..69755699c4 100644 --- a/wpilibNewCommands/build.gradle +++ b/wpilibNewCommands/build.gradle @@ -13,18 +13,18 @@ evaluationDependsOn(':wpilibj') apply from: "${rootDir}/shared/javacpp/setupBuild.gradle" dependencies { - compile project(':wpiutil') - compile project(':ntcore') - compile project(':cscore') - compile project(':hal') - compile project(':wpilibj') - devCompile project(':wpiutil') - devCompile project(':ntcore') - devCompile project(':cscore') - devCompile project(':hal') - devCompile project(':wpilibj') - testCompile 'com.google.guava:guava:19.0' - testCompile 'org.mockito:mockito-core:2.27.0' + implementation project(':wpiutil') + implementation project(':ntcore') + implementation project(':cscore') + implementation project(':hal') + implementation project(':wpilibj') + devImplementation project(':wpiutil') + devImplementation project(':ntcore') + devImplementation project(':cscore') + devImplementation project(':hal') + devImplementation project(':wpilibj') + testImplementation 'com.google.guava:guava:19.0' + testImplementation 'org.mockito:mockito-core:2.27.0' } nativeUtils.exportsConfigs { diff --git a/wpilibOldCommands/build.gradle b/wpilibOldCommands/build.gradle index 496ebcf5b7..c11b9ece99 100644 --- a/wpilibOldCommands/build.gradle +++ b/wpilibOldCommands/build.gradle @@ -13,16 +13,16 @@ evaluationDependsOn(':wpilibj') apply from: "${rootDir}/shared/javacpp/setupBuild.gradle" dependencies { - compile project(':wpiutil') - compile project(':ntcore') - compile project(':cscore') - compile project(':hal') - compile project(':wpilibj') - devCompile project(':wpiutil') - devCompile project(':ntcore') - devCompile project(':cscore') - devCompile project(':hal') - devCompile project(':wpilibj') + implementation project(':wpiutil') + implementation project(':ntcore') + implementation project(':cscore') + implementation project(':hal') + implementation project(':wpilibj') + devImplementation project(':wpiutil') + devImplementation project(':ntcore') + devImplementation project(':cscore') + devImplementation project(':hal') + devImplementation project(':wpilibj') } nativeUtils.exportsConfigs { diff --git a/wpilibc/publish.gradle b/wpilibc/publish.gradle index dd7601e948..025c09d114 100644 --- a/wpilibc/publish.gradle +++ b/wpilibc/publish.gradle @@ -7,8 +7,8 @@ def zipBaseName = '_GROUP_edu_wpi_first_wpilibc_ID_wpilibc-cpp_CLS' def outputsFolder = file("$project.buildDir/outputs") task cppSourcesZip(type: Zip) { - destinationDir = outputsFolder - baseName = zipBaseName + destinationDirectory = outputsFolder + archiveBaseName = zipBaseName classifier = "sources" from(licenseFile) { @@ -26,8 +26,8 @@ task cppSourcesZip(type: Zip) { cppSourcesZip.dependsOn generateCppVersion task cppHeadersZip(type: Zip) { - destinationDir = outputsFolder - baseName = zipBaseName + destinationDirectory = outputsFolder + archiveBaseName = zipBaseName classifier = "headers" from(licenseFile) { diff --git a/wpilibcExamples/publish.gradle b/wpilibcExamples/publish.gradle index 927d88ebc5..3bc1a09d02 100644 --- a/wpilibcExamples/publish.gradle +++ b/wpilibcExamples/publish.gradle @@ -12,8 +12,8 @@ def commandsZipBaseName = '_GROUP_edu_wpi_first_wpilibc_ID_commands_CLS' def outputsFolder = file("$project.buildDir/outputs") task cppExamplesZip(type: Zip) { - destinationDir = outputsFolder - baseName = examplesZipBaseName + destinationDirectory = outputsFolder + archiveBaseName = examplesZipBaseName from(licenseFile) { into '/' @@ -25,8 +25,8 @@ task cppExamplesZip(type: Zip) { } task cppTemplatesZip(type: Zip) { - destinationDir = outputsFolder - baseName = templatesZipBaseName + destinationDirectory = outputsFolder + archiveBaseName = templatesZipBaseName from(licenseFile) { into '/' @@ -38,8 +38,8 @@ task cppTemplatesZip(type: Zip) { } task cppCommandsZip(type: Zip) { - destinationDir = outputsFolder - baseName = commandsZipBaseName + destinationDirectory = outputsFolder + archiveBaseName = commandsZipBaseName from(licenseFile) { into '/' diff --git a/wpilibj/build.gradle b/wpilibj/build.gradle index 83a6e55dde..b4bc772b51 100644 --- a/wpilibj/build.gradle +++ b/wpilibj/build.gradle @@ -60,19 +60,19 @@ repositories { } dependencies { - compile project(':hal') - compile project(':wpiutil') - compile project(':ntcore') - compile project(':cscore') - compile project(':cameraserver') - testCompile 'com.google.guava:guava:19.0' - testCompile 'org.mockito:mockito-core:2.27.0' - devCompile project(':hal') - devCompile project(':wpiutil') - devCompile project(':ntcore') - devCompile project(':cscore') - devCompile project(':cameraserver') - devCompile sourceSets.main.output + implementation project(':hal') + implementation project(':wpiutil') + implementation project(':ntcore') + implementation project(':cscore') + implementation project(':cameraserver') + testImplementation 'com.google.guava:guava:19.0' + testImplementation 'org.mockito:mockito-core:2.27.0' + devImplementation project(':hal') + devImplementation project(':wpiutil') + devImplementation project(':ntcore') + devImplementation project(':cscore') + devImplementation project(':cameraserver') + devImplementation sourceSets.main.output } apply plugin: 'cpp' diff --git a/wpilibjExamples/build.gradle b/wpilibjExamples/build.gradle index 76021e902f..651d8e5d24 100644 --- a/wpilibjExamples/build.gradle +++ b/wpilibjExamples/build.gradle @@ -11,15 +11,15 @@ apply from: "${rootDir}/shared/opencv.gradle" dependencies { - compile project(':wpilibj') + implementation project(':wpilibj') - compile project(':hal') - compile project(':wpiutil') - compile project(':ntcore') - compile project(':cscore') - compile project(':cameraserver') - compile project(':wpilibOldCommands') - compile project(':wpilibNewCommands') + implementation project(':hal') + implementation project(':wpiutil') + implementation project(':ntcore') + implementation project(':cscore') + implementation project(':cameraserver') + implementation project(':wpilibOldCommands') + implementation project(':wpilibNewCommands') } if (!project.hasProperty('skipPMD')) { diff --git a/wpilibjExamples/publish.gradle b/wpilibjExamples/publish.gradle index a2c0746636..a5ad1c6e26 100644 --- a/wpilibjExamples/publish.gradle +++ b/wpilibjExamples/publish.gradle @@ -12,8 +12,8 @@ def commandsZipBaseName = '_GROUP_edu_wpi_first_wpilibj_ID_commands_CLS' def outputsFolder = file("$project.buildDir/outputs") task javaExamplesZip(type: Zip) { - destinationDir = outputsFolder - baseName = examplesZipBaseName + destinationDirectory = outputsFolder + archiveBaseName = examplesZipBaseName from(licenseFile) { into '/' @@ -25,8 +25,8 @@ task javaExamplesZip(type: Zip) { } task javaTemplatesZip(type: Zip) { - destinationDir = outputsFolder - baseName = templatesZipBaseName + destinationDirectory = outputsFolder + archiveBaseName = templatesZipBaseName from(licenseFile) { into '/' @@ -38,8 +38,8 @@ task javaTemplatesZip(type: Zip) { } task javaCommandsZip(type: Zip) { - destinationDir = outputsFolder - baseName = commandsZipBaseName + destinationDirectory = outputsFolder + archiveBaseName = commandsZipBaseName from(licenseFile) { into '/' diff --git a/wpilibjIntegrationTests/build.gradle b/wpilibjIntegrationTests/build.gradle index 2fc6793f03..ec5714e6b8 100644 --- a/wpilibjIntegrationTests/build.gradle +++ b/wpilibjIntegrationTests/build.gradle @@ -20,17 +20,17 @@ repositories { } dependencies { - compile project(':wpilibj') - compile project(':hal') - compile project(':wpiutil') - compile project(':ntcore') - compile project(':cscore') - compile project(':cameraserver') - compile 'junit:junit:4.11' - testCompile 'org.hamcrest:hamcrest-all:1.3' - compile 'com.googlecode.junit-toolbox:junit-toolbox:2.0' - compile 'org.apache.ant:ant:1.9.4' - compile 'org.apache.ant:ant-junit:1.9.4' + implementation project(':wpilibj') + implementation project(':hal') + implementation project(':wpiutil') + implementation project(':ntcore') + implementation project(':cscore') + implementation project(':cameraserver') + implementation 'junit:junit:4.11' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + implementation 'com.googlecode.junit-toolbox:junit-toolbox:2.0' + implementation 'org.apache.ant:ant:1.9.4' + implementation 'org.apache.ant:ant-junit:1.9.4' } build.dependsOn shadowJar diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle index 9af91a7891..a79bae4078 100644 --- a/wpiutil/build.gradle +++ b/wpiutil/build.gradle @@ -242,10 +242,10 @@ model { } dependencies { - compile "org.ejml:ejml-simple:0.38" - compile "com.fasterxml.jackson.core:jackson-annotations:2.10.0" - compile "com.fasterxml.jackson.core:jackson-core:2.10.0" - compile "com.fasterxml.jackson.core:jackson-databind:2.10.0" + api "org.ejml:ejml-simple:0.38" + api "com.fasterxml.jackson.core:jackson-annotations:2.10.0" + api "com.fasterxml.jackson.core:jackson-core:2.10.0" + api "com.fasterxml.jackson.core:jackson-databind:2.10.0" } def wpilibNumberFileInput = file("src/generate/GenericNumber.java.in")