Merge branch 'main' into jnitestrebuild

Author: spacey-sooty

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
     - uses: actions/download-artifact@v4
       with:
         name: Maven
-        path: ~/.m2/
+        path: ~/.m2/repository/
 
     - name: Setup RoboRIO Toolchain
       if: ${{ (matrix.language == 'cpp') || (matrix.language == 'asm') || (matrix.language == 'jni') }}

build.gradle

@@ -17,7 +17,7 @@ repositories {
 dependencies {
     api 'com.google.code.gson:gson:2.8.6'
 
-    api 'edu.wpi.first:native-utils:2024.6.1'
+    api 'edu.wpi.first:native-utils:2025.4.0'
 
     api 'de.undercouch:gradle-download-task:4.1.2'
 
@@ -109,6 +109,6 @@ examplesFolder.eachFile { File file ->
 jar.finalizedBy zipExamples
 
 wrapper {
-    gradleVersion = '8.5'
+    gradleVersion = '8.10.2'
     distributionType = Wrapper.DistributionType.BIN
 }

gradle.properties

@@ -1 +1 @@
-version = 2024.3.2
+version = 2025.1.1-beta-1

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

@@ -16,18 +16,6 @@ public List<String> getAllowedImageVersions() {
         return allowedImageVersions;
     }
 
-    private static String parseMessage(String imageVersion) {
-        return "Invalid RoboRIO Image Version!" +
-            "\nRoboRIO image and GradleRIO versions are incompatible:" +
-            "\n\tCurrent image version: " + imageVersion +
-            "\n\tGradleRIO-compatible image versions: 2024_v2.* except 2024_v2.0" +
-            "\nSee https://docs.wpilib.org/en/stable/docs/zero-to-robot/step-3/imaging-your-roborio.html" +
-            "for information about upgrading the RoboRIO image." +
-            "\nSee https://docs.wpilib.org/en/stable/docs/zero-to-robot/step-2/wpilib-setup.html and" +
-            "\nhttps://docs.wpilib.org/en/stable/docs/software/vscode-overview/importing-gradle-project.html" +
-            "\nfor information about updating WPILib and GradleRIO.";
-    }
-
     private static String parseMessage(String imageVersion, List<String> allowedImageVersions) {
         return "Invalid RoboRIO Image Version!" +
             "\nRoboRIO image and GradleRIO versions are incompatible:" +
@@ -46,12 +34,6 @@ public InvalidImageException(String imageVersion, List<String> allowedImageVersi
         this.allowedImageVersions = new ArrayList<>(allowedImageVersions);
     }
 
-    public InvalidImageException(String imageVersion, boolean isSpecialCase) {
-        super(parseMessage(imageVersion));
-        this.imageVersion = imageVersion;
-        this.allowedImageVersions = new ArrayList<>();
-    }
-
     public InvalidImageException() {
         super("Could not parse image version!");
         allowedImageVersions = List.of();

src/main/java/edu/wpi/first/gradlerio/deploy/roborio/InvalidImageException.java

@@ -150,10 +150,6 @@ private void readAndVerifyImage(DeployContext context) {
     }
 
     private void verifyImageVersion(String image) {
-        if (image.equalsIgnoreCase("2024_v2.0")) {
-            throw new InvalidImageException(image, true);
-        }
-
         boolean foundMatch = validImageVersions.stream().filter(x -> {
             int index = x.indexOf("*");
             if (index == -1) {

src/main/java/edu/wpi/first/gradlerio/deploy/roborio/RoboRIO.java

@@ -24,7 +24,7 @@
 public class WPIExtension {
     // WPILib (first.wpi.edu/FRC/roborio/maven) libs
 
-    private static final List<String> validImageVersions = List.of("2024_v2.*");
+    private static final List<String> validImageVersions = List.of("2025_v1.*");
 
     private String jreArtifactLocation = "edu.wpi.first.jdk:roborio-2024:17.0.9u7-3";
 
@@ -58,7 +58,7 @@ public WPIExtension(Project project) {
         platforms = new NativePlatforms();
 
         frcYear = factory.property(String.class);
-        frcYear.convention("2024");
+        frcYear.convention("2025");
 
         frcHome = factory.directoryProperty().fileProvider(project.provider(WPIExtension::computeHomeRoot))
                 .dir(frcYear);
@@ -147,8 +147,6 @@ private static File computeHomeRoot() {
     // "wpilibVersion" : new Tuple("WPILib", wpilibVersion, "wpilib"),
     // "opencvVersion" : new Tuple("OpenCV", opencvVersion, "opencv"),
     // "frcYear " : new Tuple("FRC Year", frcYear, "frcYear"),
-    // "googleTestVersion" : new Tuple("Google Test", googleTestVersion,
-    // "googleTest"),
     // "imguiVersion" : new Tuple("ImGUI", imguiVersion, "imgui"),
     // "wpimathVersion" : new Tuple("WPIMath", wpimathVersion, "wpimath"),
     // "ejmlVersion" : new Tuple("EJML", ejmlVersion, "ejml"),