Merge branch 'update-to-official-wpilib-2025' of https://github.com/T…

…itaniumTigers4829/robot-code-2025 into remove-exmples
TitaniumTigers4829 · Jan 6, 2025 · 7184f59 · 7184f59
2 parents e75a5ed + 1e0ae18
commit 7184f59
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 141 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
 # This gitignore has been specially created by the WPILib team.
 # If you remove items from this file, intellisense might break.
 *src/main/java/frc/robot/BuildConstants.java
+simgui-ds.json
+simgui.json
+networktables.json
 ### C++ ###
 # Prerequisites
 *.d

diff --git a/.wpilib/wpilib_preferences.json b/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
   "enableCppIntellisense": false,
   "currentLanguage": "java",
-  "projectYear": "2025beta",
+  "projectYear": "2025",
   "teamNumber": 4829
 }
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1"
     id "com.peterabeles.gversion" version "1.10"
     id "com.diffplug.spotless" version "6.25.0"
     id "pmd"
@@ -66,21 +66,21 @@ wpi.java.debugJni = false
 def includeDesktopSupport = true
 
 // Configuration for AdvantageKit
-repositories {
-    maven {
-        url = uri("https://maven.pkg.github.com/Mechanical-Advantage/AdvantageKit")
-        credentials {
-            username = "Mechanical-Advantage-Bot"
-            password = "\u0067\u0068\u0070\u005f\u006e\u0056\u0051\u006a\u0055\u004f\u004c\u0061\u0079\u0066\u006e\u0078\u006e\u0037\u0051\u0049\u0054\u0042\u0032\u004c\u004a\u006d\u0055\u0070\u0073\u0031\u006d\u0037\u004c\u005a\u0030\u0076\u0062\u0070\u0063\u0051"
-        }
-    }
-    mavenLocal()
-}
+// repositories {
+//     maven {
+//         url = uri("https://maven.pkg.github.com/Mechanical-Advantage/AdvantageKit")
+//         credentials {
+//             username = "Mechanical-Advantage-Bot"
+//             password = "\u0067\u0068\u0070\u005f\u006e\u0056\u0051\u006a\u0055\u004f\u004c\u0061\u0079\u0066\u006e\u0078\u006e\u0037\u0051\u0049\u0054\u0042\u0032\u004c\u004a\u006d\u0055\u0070\u0073\u0031\u006d\u0037\u004c\u005a\u0030\u0076\u0062\u0070\u0063\u0051"
+//         }
+//     }
+//     mavenLocal()
+// }
 
-task(replayWatch, type: JavaExec) {
-    mainClass = "org.littletonrobotics.junction.ReplayWatch"
-    classpath = sourceSets.main.runtimeClasspath
-}
+// task(replayWatch, type: JavaExec) {
+//     mainClass = "org.littletonrobotics.junction.ReplayWatch"
+//     classpath = sourceSets.main.runtimeClasspath
+// }
 
 // Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
 // Also defines JUnit 4.
@@ -108,8 +108,8 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
-    def akitJson = new groovy.json.JsonSlurper().parseText(new File(projectDir.getAbsolutePath() + "/vendordeps/AdvantageKit.json").text)
-    annotationProcessor "org.littletonrobotics.akit:akit-autolog:$akitJson.version"
+    // def akitJson = new groovy.json.JsonSlurper().parseText(new File(projectDir.getAbsolutePath() + "/vendordeps/AdvantageKit.json").text)
+    // annotationProcessor "org.littletonrobotics.akit:akit-autolog:$akitJson.version"
 }
 
 test {

diff --git a/gradlew b/gradlew
diff --git a/vendordeps/AdvantageKit.json b/vendordeps/AdvantageKit.json
@@ -1,23 +1,25 @@
 {
   "fileName": "AdvantageKit.json",
   "name": "AdvantageKit",
-  "version": "4.0.0-beta-1",
+  "version": "4.0.0",
   "uuid": "d820cc26-74e3-11ec-90d6-0242ac120003",
   "frcYear": "2025",
-  "mavenUrls": [],
+  "mavenUrls": [
+    "https://frcmaven.wpi.edu/artifactory/littletonrobotics-mvn-release/"
+  ],
   "jsonUrl": "https://github.com/Mechanical-Advantage/AdvantageKit/releases/latest/download/AdvantageKit.json",
   "javaDependencies": [
     {
       "groupId": "org.littletonrobotics.akit",
       "artifactId": "akit-java",
-      "version": "4.0.0-beta-1"
+      "version": "4.0.0"
     }
   ],
   "jniDependencies": [
     {
       "groupId": "org.littletonrobotics.akit",
       "artifactId": "akit-wpilibio",
-      "version": "4.0.0-beta-1",
+      "version": "4.0.0",
       "skipInvalidPlatforms": false,
       "isJar": false,
       "validPlatforms": [

diff --git a/vendordeps/ChoreoLib2025Beta.json → vendordeps/ChoreoLib-2025.0.0.json b/vendordeps/ChoreoLib2025Beta.json → vendordeps/ChoreoLib-2025.0.0.json
@@ -1,19 +1,19 @@
 {
-  "fileName": "ChoreoLib2025Beta.json",
+  "fileName": "ChoreoLib-2025.0.0.json",
   "name": "ChoreoLib",
-  "version": "2025.0.0-beta-6",
+  "version": "2025.0.0",
   "uuid": "b5e23f0a-dac9-4ad2-8dd6-02767c520aca",
   "frcYear": "2025",
   "mavenUrls": [
-    "https://SleipnirGroup.github.io/ChoreoLib/dep",
+    "https://lib.choreo.autos/dep",
     "https://repo1.maven.org/maven2"
   ],
-  "jsonUrl": "https://SleipnirGroup.github.io/ChoreoLib/dep/ChoreoLib2025Beta.json",
+  "jsonUrl": "https://lib.choreo.autos/dep/ChoreoLib2025.json",
   "javaDependencies": [
     {
       "groupId": "choreo",
       "artifactId": "ChoreoLib-java",
-      "version": "2025.0.0-beta-6"
+      "version": "2025.0.0"
     },
     {
       "groupId": "com.google.code.gson",
@@ -26,7 +26,7 @@
     {
       "groupId": "choreo",
       "artifactId": "ChoreoLib-cpp",
-      "version": "2025.0.0-beta-6",
+      "version": "2025.0.0",
       "libName": "ChoreoLib",
       "headerClassifier": "headers",
       "sharedLibrary": false,

diff --git a/vendordeps/Phoenix6-25.0.0-beta-4.json → vendordeps/Phoenix6-25.1.0.json b/vendordeps/Phoenix6-25.0.0-beta-4.json → vendordeps/Phoenix6-25.1.0.json
@@ -1,32 +1,32 @@
 {
-  "fileName": "Phoenix6-25.0.0-beta-4.json",
+  "fileName": "Phoenix6-25.1.0.json",
   "name": "CTRE-Phoenix (v6)",
-  "version": "25.0.0-beta-4",
+  "version": "25.1.0",
   "frcYear": "2025",
   "uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
   "mavenUrls": [
     "https://maven.ctr-electronics.com/release/"
   ],
-  "jsonUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-frc2025-beta-latest.json",
+  "jsonUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-frc2025-latest.json",
   "conflictsWith": [
     {
       "uuid": "e7900d8d-826f-4dca-a1ff-182f658e98af",
       "errorMessage": "Users can not have both the replay and regular Phoenix 6 vendordeps in their robot program.",
-      "offlineFileName": "Phoenix6-replay-frc2025-beta-latest.json"
+      "offlineFileName": "Phoenix6-replay-frc2025-latest.json"
     }
   ],
   "javaDependencies": [
     {
       "groupId": "com.ctre.phoenix6",
       "artifactId": "wpiapi-java",
-      "version": "25.0.0-beta-4"
+      "version": "25.1.0"
     }
   ],
   "jniDependencies": [
     {
       "groupId": "com.ctre.phoenix6",
       "artifactId": "api-cpp",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -40,7 +40,7 @@
     {
       "groupId": "com.ctre.phoenix6",
       "artifactId": "tools",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -54,7 +54,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "api-cpp-sim",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -68,7 +68,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "tools-sim",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -82,7 +82,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simTalonSRX",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -96,7 +96,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simVictorSPX",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -110,7 +110,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simPigeonIMU",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -124,7 +124,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simCANCoder",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -138,7 +138,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simProTalonFX",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -152,7 +152,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simProCANcoder",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -165,8 +165,8 @@
     },
     {
       "groupId": "com.ctre.phoenix6.sim",
-      "artifactId": "simProCANrange",
-      "version": "25.0.0-beta-4",
+      "artifactId": "simProPigeon2",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -179,8 +179,8 @@
     },
     {
       "groupId": "com.ctre.phoenix6.sim",
-      "artifactId": "simProPigeon2",
-      "version": "25.0.0-beta-4",
+      "artifactId": "simProCANrange",
+      "version": "25.1.0",
       "isJar": false,
       "skipInvalidPlatforms": true,
       "validPlatforms": [
@@ -196,7 +196,7 @@
     {
       "groupId": "com.ctre.phoenix6",
       "artifactId": "wpiapi-cpp",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "libName": "CTRE_Phoenix6_WPI",
       "headerClassifier": "headers",
       "sharedLibrary": true,
@@ -212,7 +212,7 @@
     {
       "groupId": "com.ctre.phoenix6",
       "artifactId": "tools",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "libName": "CTRE_PhoenixTools",
       "headerClassifier": "headers",
       "sharedLibrary": true,
@@ -228,7 +228,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "wpiapi-cpp-sim",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "libName": "CTRE_Phoenix6_WPISim",
       "headerClassifier": "headers",
       "sharedLibrary": true,
@@ -244,7 +244,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "tools-sim",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "libName": "CTRE_PhoenixTools_Sim",
       "headerClassifier": "headers",
       "sharedLibrary": true,
@@ -260,7 +260,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simTalonSRX",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "libName": "CTRE_SimTalonSRX",
       "headerClassifier": "headers",
       "sharedLibrary": true,
@@ -276,7 +276,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simVictorSPX",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "libName": "CTRE_SimVictorSPX",
       "headerClassifier": "headers",
       "sharedLibrary": true,
@@ -292,7 +292,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simPigeonIMU",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "libName": "CTRE_SimPigeonIMU",
       "headerClassifier": "headers",
       "sharedLibrary": true,
@@ -308,7 +308,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simCANCoder",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "libName": "CTRE_SimCANCoder",
       "headerClassifier": "headers",
       "sharedLibrary": true,
@@ -324,7 +324,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simProTalonFX",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "libName": "CTRE_SimProTalonFX",
       "headerClassifier": "headers",
       "sharedLibrary": true,
@@ -340,7 +340,7 @@
     {
       "groupId": "com.ctre.phoenix6.sim",
       "artifactId": "simProCANcoder",
-      "version": "25.0.0-beta-4",
+      "version": "25.1.0",
       "libName": "CTRE_SimProCANcoder",
       "headerClassifier": "headers",
       "sharedLibrary": true,
@@ -355,9 +355,9 @@
     },
     {
       "groupId": "com.ctre.phoenix6.sim",
-      "artifactId": "simProCANrange",
-      "version": "25.0.0-beta-4",
-      "libName": "CTRE_SimProCANrange",
+      "artifactId": "simProPigeon2",
+      "version": "25.1.0",
+      "libName": "CTRE_SimProPigeon2",
       "headerClassifier": "headers",
       "sharedLibrary": true,
       "skipInvalidPlatforms": true,
@@ -371,9 +371,9 @@
     },
     {
       "groupId": "com.ctre.phoenix6.sim",
-      "artifactId": "simProPigeon2",
-      "version": "25.0.0-beta-4",
-      "libName": "CTRE_SimProPigeon2",
+      "artifactId": "simProCANrange",
+      "version": "25.1.0",
+      "libName": "CTRE_SimProCANrange",
       "headerClassifier": "headers",
       "sharedLibrary": true,
       "skipInvalidPlatforms": true,