Update to WPILib beta 2

PhotonVision · Nov 19, 2024 · 4ea18e0 · 4ea18e0
1 parent adb18fe
commit 4ea18e0
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 38 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id "cpp"
     id "com.diffplug.spotless" version "6.24.0"
     id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
     id 'edu.wpi.first.WpilibTools' version '1.3.0'
     id 'com.google.protobuf' version '0.9.3' apply false
     id 'edu.wpi.first.GradleJni' version '1.1.0'
@@ -30,7 +30,7 @@ ext.allOutputsFolder = file("$project.buildDir/outputs")
 apply from: "versioningHelper.gradle"
 
 ext {
-    wpilibVersion = "2025.1.1-beta-1"
+    wpilibVersion = "2025.1.1-beta-2"
     wpimathVersion = wpilibVersion
     openCVYear = "2024"
     openCVversion = "4.8.0-4"

diff --git a/photon-targeting/src/generated/main/java/org/photonvision/jni/WpilibLoader.java b/photon-targeting/src/generated/main/java/org/photonvision/jni/WpilibLoader.java
@@ -25,13 +25,7 @@
 import edu.wpi.first.cscore.CameraServerJNI;
 import edu.wpi.first.cscore.OpenCvLoader;
 import edu.wpi.first.hal.JNIWrapper;
-import edu.wpi.first.math.jni.ArmFeedforwardJNI;
-import edu.wpi.first.math.jni.DAREJNI;
-import edu.wpi.first.math.jni.EigenJNI;
-import edu.wpi.first.math.jni.Ellipse2dJNI;
-import edu.wpi.first.math.jni.Pose3dJNI;
-import edu.wpi.first.math.jni.StateSpaceUtilJNI;
-import edu.wpi.first.math.jni.TrajectoryUtilJNI;
+import edu.wpi.first.math.jni.WPIMathJNI;
 import edu.wpi.first.net.WPINetJNI;
 import edu.wpi.first.networktables.NetworkTablesJNI;
 import edu.wpi.first.util.CombinedRuntimeLoader;
@@ -48,18 +42,8 @@ public static boolean loadLibraries() {
         OpenCvLoader.Helper.setExtractOnStaticLoad(false);
         JNIWrapper.Helper.setExtractOnStaticLoad(false);
         WPINetJNI.Helper.setExtractOnStaticLoad(false);
+        WPIMathJNI.Helper.setExtractOnStaticLoad(false);
         AprilTagJNI.Helper.setExtractOnStaticLoad(false);
-
-        // wpimathjni is a bit odd, it's all in the wpimathjni shared lib, but the java side stuff has
-        // been split.
-        ArmFeedforwardJNI.Helper.setExtractOnStaticLoad(false);
-        DAREJNI.Helper.setExtractOnStaticLoad(false);
-        EigenJNI.Helper.setExtractOnStaticLoad(false);
-        Ellipse2dJNI.Helper.setExtractOnStaticLoad(false);
-        Pose3dJNI.Helper.setExtractOnStaticLoad(false);
-        StateSpaceUtilJNI.Helper.setExtractOnStaticLoad(false);
-        TrajectoryUtilJNI.Helper.setExtractOnStaticLoad(false);
-
         try {
             CombinedRuntimeLoader.loadLibraries(
                     WpilibLoader.class,

diff --git a/photonlib-cpp-examples/aimandrange/build.gradle b/photonlib-cpp-examples/aimandrange/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
 }
 
 repositories {
@@ -11,8 +11,8 @@ repositories {
 
 wpi.maven.useLocal = false
 wpi.maven.useDevelopment = false
-wpi.versions.wpilibVersion = "2025.1.1-beta-1"
-wpi.versions.wpimathVersion = "2025.1.1-beta-1"
+wpi.versions.wpilibVersion = "2025.1.1-beta-2"
+wpi.versions.wpimathVersion = "2025.1.1-beta-2"
 
 // Define my targets (RoboRIO) and artifacts (deployable files)
 // This is added by GradleRIO's backing project DeployUtils.

diff --git a/photonlib-cpp-examples/aimattarget/build.gradle b/photonlib-cpp-examples/aimattarget/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
 }
 
 repositories {
@@ -11,8 +11,8 @@ repositories {
 
 wpi.maven.useLocal = false
 wpi.maven.useDevelopment = false
-wpi.versions.wpilibVersion = "2025.1.1-beta-1"
-wpi.versions.wpimathVersion = "2025.1.1-beta-1"
+wpi.versions.wpilibVersion = "2025.1.1-beta-2"
+wpi.versions.wpimathVersion = "2025.1.1-beta-2"
 
 // Define my targets (RoboRIO) and artifacts (deployable files)
 // This is added by GradleRIO's backing project DeployUtils.

diff --git a/photonlib-cpp-examples/poseest/build.gradle b/photonlib-cpp-examples/poseest/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
 }
 
 repositories {
@@ -11,8 +11,8 @@ repositories {
 
 wpi.maven.useLocal = false
 wpi.maven.useDevelopment = false
-wpi.versions.wpilibVersion = "2025.1.1-beta-1"
-wpi.versions.wpimathVersion = "2025.1.1-beta-1"
+wpi.versions.wpilibVersion = "2025.1.1-beta-2"
+wpi.versions.wpimathVersion = "2025.1.1-beta-2"
 
 // Define my targets (RoboRIO) and artifacts (deployable files)
 // This is added by GradleRIO's backing project DeployUtils.

diff --git a/photonlib-java-examples/aimandrange/build.gradle b/photonlib-java-examples/aimandrange/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11
@@ -13,8 +13,8 @@ repositories {
 }
 
 wpi.maven.useDevelopment = true
-wpi.versions.wpilibVersion = "2025.1.1-beta-1"
-wpi.versions.wpimathVersion = "2025.1.1-beta-1"
+wpi.versions.wpilibVersion = "2025.1.1-beta-2"
+wpi.versions.wpimathVersion = "2025.1.1-beta-2"
 
 
 // Define my targets (RoboRIO) and artifacts (deployable files)

diff --git a/photonlib-java-examples/aimattarget/build.gradle b/photonlib-java-examples/aimattarget/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11
@@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_11
 def ROBOT_MAIN_CLASS = "frc.robot.Main"
 
 wpi.maven.useDevelopment = true
-wpi.versions.wpilibVersion = "2025.1.1-beta-1"
-wpi.versions.wpimathVersion = "2025.1.1-beta-1"
+wpi.versions.wpilibVersion = "2025.1.1-beta-2"
+wpi.versions.wpimathVersion = "2025.1.1-beta-2"
 
 
 // Define my targets (RoboRIO) and artifacts (deployable files)

diff --git a/photonlib-java-examples/poseest/build.gradle b/photonlib-java-examples/poseest/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11
@@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_11
 def ROBOT_MAIN_CLASS = "frc.robot.Main"
 
 wpi.maven.useDevelopment = true
-wpi.versions.wpilibVersion = "2025.1.1-beta-1"
-wpi.versions.wpimathVersion = "2025.1.1-beta-1"
+wpi.versions.wpilibVersion = "2025.1.1-beta-2"
+wpi.versions.wpimathVersion = "2025.1.1-beta-2"
 
 
 // Define my targets (RoboRIO) and artifacts (deployable files)