Bump wpilib to 2024.1.1 (#1127)

Does not yet include test mode
2026-06-19 00:41:41 +00:00 · 2024-01-06 22:44:28 -07:00
parent b8a6a5d56a
commit bf5e8dc81b
16 changed files with 19 additions and 19 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
    id "com.diffplug.spotless" version "6.22.0"
    id "edu.wpi.first.NativeUtils" version "2024.6.1" apply false
    id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-4"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1"
    id 'edu.wpi.first.WpilibTools' version '1.3.0'
    id 'com.google.protobuf' version '0.9.4' apply false
 }
@@ -22,7 +22,7 @@ allprojects {
 apply from: "versioningHelper.gradle"

 ext {
-    wpilibVersion = "2024.1.1-beta-4-35-g141241d"
+    wpilibVersion = "2024.1.1"
    wpimathVersion = wpilibVersion
    openCVversion = "4.8.0-2"
    joglVersion = "2.4.0-rc-20200307"
--- a/photon-core/src/main/java/org/photonvision/common/configuration/LegacyConfigProvider.java
+++ b/photon-core/src/main/java/org/photonvision/common/configuration/LegacyConfigProvider.java
@@ -196,7 +196,7 @@ class LegacyConfigProvider extends ConfigProvider {
            }
        }
        if (atfl == null) {
-            logger.info("Loading default apriltags for 2023 field...");
+            logger.info("Loading default apriltags for 2024 field...");
            try {
                atfl = AprilTagFields.kDefaultField.loadAprilTagLayoutField();
            } catch (UncheckedIOException e) {
--- a/photonlib-cpp-examples/aimandrange/.wpilib/wpilib_preferences.json
+++ b/photonlib-cpp-examples/aimandrange/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
    "enableCppIntellisense": true,
    "currentLanguage": "cpp",
-    "projectYear": "2023",
+    "projectYear": "2024",
    "teamNumber": 5
 }
--- a/photonlib-cpp-examples/aimattarget/.wpilib/wpilib_preferences.json
+++ b/photonlib-cpp-examples/aimattarget/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
    "enableCppIntellisense": true,
    "currentLanguage": "cpp",
-    "projectYear": "2023",
+    "projectYear": "2024",
    "teamNumber": 5
 }
--- a/photonlib-cpp-examples/apriltagExample/.wpilib/wpilib_preferences.json
+++ b/photonlib-cpp-examples/apriltagExample/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
    "enableCppIntellisense": true,
    "currentLanguage": "cpp",
-    "projectYear": "2023",
+    "projectYear": "2024",
    "teamNumber": 5
 }
--- a/photonlib-cpp-examples/build.gradle
+++ b/photonlib-cpp-examples/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    id "com.diffplug.spotless" version "6.1.2"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-4" apply false
+    id "edu.wpi.first.GradleRIO" version "2024.1.1" apply false
 }

 allprojects {
--- a/photonlib-cpp-examples/getinrange/.wpilib/wpilib_preferences.json
+++ b/photonlib-cpp-examples/getinrange/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
    "enableCppIntellisense": true,
    "currentLanguage": "cpp",
-    "projectYear": "2023",
+    "projectYear": "2024",
    "teamNumber": 5
 }
--- a/photonlib-cpp-examples/swervedriveposeestsim/.wpilib/wpilib_preferences.json
+++ b/photonlib-cpp-examples/swervedriveposeestsim/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
    "enableCppIntellisense": true,
    "currentLanguage": "cpp",
-    "projectYear": "2023",
+    "projectYear": "2024",
    "teamNumber": 5
 }
--- a/photonlib-cpp-examples/swervedriveposeestsim/build.gradle
+++ b/photonlib-cpp-examples/swervedriveposeestsim/build.gradle
@@ -12,8 +12,8 @@ repositories {
 }

 wpi.maven.useDevelopment = true
-wpi.versions.wpilibVersion = "2024.1.1-beta-4-35-g141241d"
-wpi.versions.wpimathVersion = "2024.1.1-beta-4-35-g141241d"
+wpi.versions.wpilibVersion = "2024.1.1"
+wpi.versions.wpimathVersion = "2024.1.1"

 apply from: "${rootDir}/../shared/examples_common.gradle"

--- a/photonlib-java-examples/aimandrange/.wpilib/wpilib_preferences.json
+++ b/photonlib-java-examples/aimandrange/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
    "enableCppIntellisense": false,
    "currentLanguage": "java",
-    "projectYear": "2023",
+    "projectYear": "2024",
    "teamNumber": 6995
 }
--- a/photonlib-java-examples/aimattarget/.wpilib/wpilib_preferences.json
+++ b/photonlib-java-examples/aimattarget/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
    "enableCppIntellisense": false,
    "currentLanguage": "java",
-    "projectYear": "2023",
+    "projectYear": "2024",
    "teamNumber": 6995
 }
--- a/photonlib-java-examples/build.gradle
+++ b/photonlib-java-examples/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    id "com.diffplug.spotless" version "6.1.2"
-    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-4" apply false
+    id "edu.wpi.first.GradleRIO" version "2024.1.1" apply false
 }

 apply from: "examples.gradle"
--- a/photonlib-java-examples/getinrange/.wpilib/wpilib_preferences.json
+++ b/photonlib-java-examples/getinrange/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
    "enableCppIntellisense": false,
    "currentLanguage": "java",
-    "projectYear": "2023",
+    "projectYear": "2024",
    "teamNumber": 6995
 }
--- a/photonlib-java-examples/simaimandrange/.wpilib/wpilib_preferences.json
+++ b/photonlib-java-examples/simaimandrange/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
    "enableCppIntellisense": false,
    "currentLanguage": "java",
-    "projectYear": "2023",
+    "projectYear": "2024",
    "teamNumber": 6995
 }
--- a/photonlib-java-examples/swervedriveposeestsim/.wpilib/wpilib_preferences.json
+++ b/photonlib-java-examples/swervedriveposeestsim/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
    "enableCppIntellisense": false,
    "currentLanguage": "java",
-    "projectYear": "2023",
+    "projectYear": "2024",
    "teamNumber": 4512
 }
--- a/photonlib-java-examples/swervedriveposeestsim/build.gradle
+++ b/photonlib-java-examples/swervedriveposeestsim/build.gradle
@@ -11,8 +11,8 @@ apply from: "${rootDir}/../shared/examples_common.gradle"
 def ROBOT_MAIN_CLASS = "frc.robot.Main"

 wpi.maven.useDevelopment = true
-wpi.versions.wpilibVersion = "2024.1.1-beta-4-35-g141241d"
-wpi.versions.wpimathVersion = "2024.1.1-beta-4-35-g141241d"
+wpi.versions.wpilibVersion = "2024.1.1"
+wpi.versions.wpimathVersion = "2024.1.1"


 // Define my targets (RoboRIO) and artifacts (deployable files)