Update for 2025 (#5)

sciencewhiz · web-flow · commit 9020718b022b · 2025-01-16T20:07:52.000-07:00
diff --git a/Cpp/build.gradle b/Cpp/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "cpp"
-    id "edu.wpi.first.GradleRIO" version "2024.2.1"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1"
 }
 
 // Disable local cache, as it won't have the cross artifact necessary
@@ -40,5 +40,5 @@ model {
 }
 
 wrapper {
-    gradleVersion = '8.5'
+    gradleVersion = '8.11'
 }
diff --git a/Cpp/gradle/wrapper/gradle-wrapper.jar b/Cpp/gradle/wrapper/gradle-wrapper.jar
diff --git a/Cpp/gradle/wrapper/gradle-wrapper.properties b/Cpp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=permwrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/Cpp/gradlew b/Cpp/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/Cpp/gradlew.bat b/Cpp/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/Java/build.gradle b/Java/build.gradle
@@ -1,9 +1,9 @@
 plugins {
     id "java"
     id 'application'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
-    id "edu.wpi.first.GradleRIO" version "2024.2.1"
-    id 'edu.wpi.first.WpilibTools' version '1.3.0'
+    id 'com.gradleup.shadow' version '8.3.5'
+    id "edu.wpi.first.GradleRIO" version "2025.1.1"
+    id 'edu.wpi.first.WpilibTools' version '2.1.0'
 }
 
 application {
@@ -52,5 +52,5 @@ shadowJar {
 }
 
 wrapper {
-    gradleVersion = '8.5'
+    gradleVersion = '8.11'
 }
diff --git a/Java/gradle/wrapper/gradle-wrapper.jar b/Java/gradle/wrapper/gradle-wrapper.jar
diff --git a/Java/gradle/wrapper/gradle-wrapper.properties b/Java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=permwrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/Java/gradlew b/Java/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/Java/gradlew.bat b/Java/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/Java/src/main/java/Program.java b/Java/src/main/java/Program.java
@@ -8,9 +8,9 @@
 import org.opencv.core.Core;
 import org.opencv.core.Mat;
 
-import edu.wpi.first.cscore.CameraServerCvJNI;
 import edu.wpi.first.cscore.CameraServerJNI;
-import edu.wpi.first.math.WPIMathJNI;
+import edu.wpi.first.cscore.OpenCvLoader;
+import edu.wpi.first.math.jni.EigenJNI;
 import edu.wpi.first.util.WPIUtilJNI;
 
 /**
@@ -20,9 +20,9 @@ public class Program {
     public static void main(String[] args) throws IOException {
         NetworkTablesJNI.Helper.setExtractOnStaticLoad(false);
         WPIUtilJNI.Helper.setExtractOnStaticLoad(false);
-        WPIMathJNI.Helper.setExtractOnStaticLoad(false);
+        EigenJNI.Helper.setExtractOnStaticLoad(false);
         CameraServerJNI.Helper.setExtractOnStaticLoad(false);
-        CameraServerCvJNI.Helper.setExtractOnStaticLoad(false);
+        OpenCvLoader.Helper.setExtractOnStaticLoad(false);
 
         CombinedRuntimeLoader.loadLibraries(Program.class, "wpiutiljni", "wpimathjni", "ntcorejni", Core.NATIVE_LIBRARY_NAME, "cscorejni");
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "cpp"`
`3`		`- id "edu.wpi.first.GradleRIO" version "2024.2.1"`
	`3`	`+ id "edu.wpi.first.GradleRIO" version "2025.1.1"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`// Disable local cache, as it won't have the cross artifact necessary`
`@@ -40,5 +40,5 @@ model {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`wrapper {`
`43`		`- gradleVersion = '8.5'`
	`43`	`+ gradleVersion = '8.11'`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`# See the License for the specific language governing permissions and`
`16`	`16`	`# limitations under the License.`
`17`	`17`	`#`
	`18`	`+# SPDX-License-Identifier: Apache-2.0`
	`19`	`+#`
`18`	`20`
`19`	`21`	`##############################################################################`
`20`	`22`	`#`
`@@ -55,7 +57,7 @@`
`55`	`57`	`# Darwin, MinGW, and NonStop.`
`56`	`58`	`#`
`57`	`59`	`# (3) This script is generated from the Groovy template`
`58`		`-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
	`60`	`+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
`59`	`61`	`# within the Gradle project.`
`60`	`62`	`#`
`61`	`63`	`# You can find Gradle at https://github.com/gradle/gradle/.`
`@@ -84,7 +86,8 @@ done`
`84`	`86`	`# shellcheck disable=SC2034`
`85`	`87`	`APP_BASE_NAME=${0##*/}`
`86`	`88`	`# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)`
`87`		`-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) \|\| exit`
	`89`	`+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s`
	`90`	`+' "$PWD" ) \|\| exit`
`88`	`91`
`89`	`92`	`# Use the maximum available, or set MAX_FD != -1 to use that value.`
`90`	`93`	`MAX_FD=maximum`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "java"`
`3`	`3`	`id 'application'`
`4`		`- id 'com.github.johnrengelman.shadow' version '8.1.1'`
`5`		`- id "edu.wpi.first.GradleRIO" version "2024.2.1"`
`6`		`- id 'edu.wpi.first.WpilibTools' version '1.3.0'`
	`4`	`+ id 'com.gradleup.shadow' version '8.3.5'`
	`5`	`+ id "edu.wpi.first.GradleRIO" version "2025.1.1"`
	`6`	`+ id 'edu.wpi.first.WpilibTools' version '2.1.0'`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`application {`
`@@ -52,5 +52,5 @@ shadowJar {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`wrapper {`
`55`		`- gradleVersion = '8.5'`
	`55`	`+ gradleVersion = '8.11'`
`56`	`56`	`}`