NoahLacks63/MotionTragic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to latest 2020 build setup

Browse Source
This commit is contained in:
Thad House 2020-06-28 16:07:40 -07:00
parent f97a2d5d5f
commit 28e74c83f8
7 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build.gradle
View File

@ -1,11 +1,10 @@
plugins { plugins {
id 'cpp' id 'cpp'
id 'java' id 'java'
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' version '2020.1.0' id 'edu.wpi.first.NativeUtils' version '2020.7.4'
id 'edu.wpi.first.GradleJni' version '0.9.1' id 'edu.wpi.first.GradleJni' version '0.10.1'
id 'edu.wpi.first.GradleVsCode' version '0.9.4' id 'edu.wpi.first.GradleVsCode' version '0.12.0'
} }
repositories { repositories {
@ -22,13 +21,13 @@ apply from: 'config.gradle'
// Apply Java configuration // Apply Java configuration
dependencies { dependencies {
compile 'edu.wpi.first.cscore:cscore-java:2019.+' implementation 'edu.wpi.first.cscore:cscore-java:2020.+'
compile 'edu.wpi.first.cameraserver:cameraserver-java:2019.+' implementation 'edu.wpi.first.cameraserver:cameraserver-java:2020.+'
compile 'edu.wpi.first.ntcore:ntcore-java:2019.+' implementation 'edu.wpi.first.ntcore:ntcore-java:2020.+'
compile 'edu.wpi.first.wpilibj:wpilibj-java:2019.+' implementation 'edu.wpi.first.wpilibj:wpilibj-java:2020.+'
compile 'edu.wpi.first.wpiutil:wpiutil-java:2019.+' implementation 'edu.wpi.first.wpiutil:wpiutil-java:2020.+'
compile 'edu.wpi.first.hal:hal-java:2019.+' implementation 'edu.wpi.first.hal:hal-java:2020.+'
compile 'edu.wpi.first.thirdparty.frc2020.opencv:opencv-java:3.4.7-1' implementation 'edu.wpi.first.thirdparty.frc2020.opencv:opencv-java:3.4.7-3'
} }
// Set up exports properly // Set up exports properly
@ -93,5 +92,5 @@ model {
apply from: 'publish.gradle' apply from: 'publish.gradle'
wrapper { wrapper {
gradleVersion '5.4.1' gradleVersion '6.0.1'
} }

9
config.gradle
View File

@ -6,10 +6,11 @@ nativeUtils.withRoboRIO()
nativeUtils { nativeUtils {
wpi { wpi {
configureDependencies { configureDependencies {
wpiVersion = "2019.+" wpiVersion = "2020.+"
niLibVersion = "2019.12.2" niLibVersion = "2020.10.1"
opencvVersion = "3.4.7-1" opencvVersion = "3.4.7-3"
googleTestVersion = "1.9.0-3-437e100" googleTestVersion = "1.9.0-4-437e100-1"
imguiVersion = "1.76-2"
} }
} }
} }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

35
gradlew vendored
View File

@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # 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 # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # 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\"" GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi fi
# For Cygwin, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if $cygwin ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`
@ -154,19 +154,19 @@ if $cygwin ; then
else else
eval `echo args$i`="\"$arg\"" eval `echo args$i`="\"$arg\""
fi fi
i=$((i+1)) i=`expr $i + 1`
done done
case $i in case $i in
(0) set -- ;; 0) set -- ;;
(1) set -- "$args0" ;; 1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;; 2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;; 3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;; 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac esac
fi fi
@ -175,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " " echo " "
} }
APP_ARGS=$(save "$@") APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules # 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" 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" "$@" exec "$JAVACMD" "$@"

2
gradlew.bat vendored
View File

@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License. @rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at @rem You may obtain a copy of the License at
@rem @rem
@rem http://www.apache.org/licenses/LICENSE-2.0 @rem https://www.apache.org/licenses/LICENSE-2.0
@rem @rem
@rem Unless required by applicable law or agreed to in writing, software @rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS, @rem distributed under the License is distributed on an "AS IS" BASIS,

24
publish.gradle
View File

@ -47,8 +47,8 @@ def zipBaseName = "_GROUP_com_vendor_frc_ID_${baseArtifactId}-cpp_CLS"
def javaBaseName = "_GROUP_com_vendor_frc_ID_${baseArtifactId}-java_CLS" def javaBaseName = "_GROUP_com_vendor_frc_ID_${baseArtifactId}-java_CLS"
task cppHeadersZip(type: Zip) { task cppHeadersZip(type: Zip) {
destinationDir = outputsFolder destinationDirectory = outputsFolder
baseName = zipBaseName archiveBaseName = zipBaseName
classifier = "headers" classifier = "headers"
from(licenseFile) { from(licenseFile) {
@ -61,8 +61,8 @@ task cppHeadersZip(type: Zip) {
} }
task cppSourceZip(type: Zip) { task cppSourceZip(type: Zip) {
destinationDir = outputsFolder destinationDirectory = outputsFolder
baseName = zipBaseName archiveBaseName = zipBaseName
classifier = "source" classifier = "source"
from(licenseFile) { from(licenseFile) {
@ -75,8 +75,8 @@ task cppSourceZip(type: Zip) {
} }
task cppDriverHeadersZip(type: Zip) { task cppDriverHeadersZip(type: Zip) {
destinationDir = outputsFolder destinationDirectory = outputsFolder
baseName = driverZipBaseName archiveBaseName = driverZipBaseName
classifier = "headers" classifier = "headers"
from(licenseFile) { from(licenseFile) {
@ -106,21 +106,21 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
} }
task outputJar(type: Jar, dependsOn: classes) { task outputJar(type: Jar, dependsOn: classes) {
baseName javaBaseName archiveBaseName = javaBaseName
destinationDir outputsFolder destinationDirectory = outputsFolder
from sourceSets.main.output from sourceSets.main.output
} }
task outputSourcesJar(type: Jar, dependsOn: classes) { task outputSourcesJar(type: Jar, dependsOn: classes) {
baseName javaBaseName archiveBaseName = javaBaseName
destinationDir outputsFolder destinationDirectory = outputsFolder
classifier = 'sources' classifier = 'sources'
from sourceSets.main.allSource from sourceSets.main.allSource
} }
task outputJavadocJar(type: Jar, dependsOn: javadoc) { task outputJavadocJar(type: Jar, dependsOn: javadoc) {
baseName javaBaseName archiveBaseName = javaBaseName
destinationDir outputsFolder destinationDirectory = outputsFolder
classifier = 'javadoc' classifier = 'javadoc'
from javadoc.destinationDir from javadoc.destinationDir
} }