Merge branch 'main' into feature/ArmUpgrades

Team488 · Feb 21, 2024 · b639725 · b639725
2 parents 4ef5d0e + 8de7a35
commit b639725
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 180 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,9 @@
 # Created by https://www.gitignore.io/api/c++,java,linux,macos,gradle,windows,visualstudiocode
 
+simgui.json
+simgui-ds.json
+simgui-window.json
+
 ### C++ ###
 # Prerequisites
 *.d

diff --git a/SeriouslyCommonLib b/SeriouslyCommonLib
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ import edu.wpi.first.gradlerio.deploy.roborio.RoboRIO
 
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.2.1"
+    id "edu.wpi.first.GradleRIO" version "2024.3.1"
     id 'checkstyle'
     id 'jacoco'
     id 'org.hidetake.ssh' version "2.9.0"

diff --git a/simgui-ds.json b/simgui-ds.json
diff --git a/simgui-window.json b/simgui-window.json
diff --git a/simgui.json b/simgui.json
diff --git a/vendordeps/AdvantageKit.json b/vendordeps/AdvantageKit.json
@@ -1,7 +1,7 @@
 {
   "fileName": "AdvantageKit.json",
   "name": "AdvantageKit",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "uuid": "d820cc26-74e3-11ec-90d6-0242ac120003",
   "frcYear": "2024",
   "mavenUrls": [],
@@ -10,24 +10,24 @@
     {
       "groupId": "org.littletonrobotics.akit.junction",
       "artifactId": "wpilib-shim",
-      "version": "3.0.2"
+      "version": "3.1.0"
     },
     {
       "groupId": "org.littletonrobotics.akit.junction",
       "artifactId": "junction-core",
-      "version": "3.0.2"
+      "version": "3.1.0"
     },
     {
       "groupId": "org.littletonrobotics.akit.conduit",
       "artifactId": "conduit-api",
-      "version": "3.0.2"
+      "version": "3.1.0"
     }
   ],
   "jniDependencies": [
     {
       "groupId": "org.littletonrobotics.akit.conduit",
       "artifactId": "conduit-wpilibio",
-      "version": "3.0.2",
+      "version": "3.1.0",
       "skipInvalidPlatforms": false,
       "isJar": false,
       "validPlatforms": [