Merge remote-tracking branch 'origin/2025' into jnitests

build.gradle

@@ -10,6 +10,9 @@ plugins {
   id 'edu.wpi.first.GradleVsCode' version '2.1.0'
 }
 
+// WPILib Version
+ext.wpilibVersion = "2025.+"
+
 repositories {
   mavenCentral()
 }
@@ -29,14 +32,14 @@ apply from: 'config.gradle'
 
 // Apply Java configuration
 dependencies {
-    implementation 'edu.wpi.first.cscore:cscore-java:2025.+'
-    implementation 'edu.wpi.first.cameraserver:cameraserver-java:2025.+'
-    implementation 'edu.wpi.first.ntcore:ntcore-java:2025.+'
-    implementation 'edu.wpi.first.wpilibj:wpilibj-java:2025.+'
-    implementation 'edu.wpi.first.wpiutil:wpiutil-java:2025.+'
-    implementation 'edu.wpi.first.wpimath:wpimath-java:2025.+'
-    implementation 'edu.wpi.first.wpiunits:wpiunits-java:2025.+'
-    implementation 'edu.wpi.first.hal:hal-java:2025.+'
+    implementation "edu.wpi.first.cscore:cscore-java:$wpilibVersion"
+    implementation "edu.wpi.first.cameraserver:cameraserver-java:$wpilibVersion"
+    implementation "edu.wpi.first.ntcore:ntcore-java:$wpilibVersion"
+    implementation "edu.wpi.first.wpilibj:wpilibj-java:$wpilibVersion"
+    implementation "edu.wpi.first.wpiutil:wpiutil-java:$wpilibVersion"
+    implementation "edu.wpi.first.wpimath:wpimath-java:$wpilibVersion"
+    implementation "edu.wpi.first.wpiunits:wpiunits-java:$wpilibVersion"
+    implementation "edu.wpi.first.hal:hal-java:$wpilibVersion"
     implementation "org.ejml:ejml-simple:0.43.1"
     implementation "com.fasterxml.jackson.core:jackson-annotations:2.15.2"
     implementation "com.fasterxml.jackson.core:jackson-core:2.15.2"

config.gradle

@@ -8,7 +8,7 @@ nativeUtils.withCrossLinuxArm64()
 nativeUtils {
     wpi {
         configureDependencies {
-            wpiVersion = "2025.+"
+            wpiVersion = wpilibVersion
             opencvYear = "frc2024"
             niLibVersion = "2025.0.0"
             opencvVersion = "4.8.0-4"