Bump more things!

PhotonVision · Oct 15, 2023 · 7d02722 · 7d02722
1 parent d7411f7
commit 7d02722
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -256,7 +256,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - container: wpilib/roborio-cross-ubuntu:2023-22.04
+          - container: wpilib/roborio-cross-ubuntu:2024-22.04
             artifact-name: Athena
           - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
             artifact-name: Raspbian

diff --git a/photon-lib/publish.gradle b/photon-lib/publish.gradle
@@ -198,5 +198,10 @@ model {
     }
 }
 
+// So I don't actually know the _right_ way to tell gradle that the vendordep json publish requires generation first, so we're doing this
+getTasksByName("publishVendorjsonPublicationToMavenLocal", false).each {
+    it.mustRunAfter generateVendorJson
+}
+
 publishToMavenLocal.dependsOn libraryBuild
 publish.dependsOn libraryBuild
diff --git a/shared/config.gradle b/shared/config.gradle
@@ -8,7 +8,7 @@ nativeUtils.withCrossLinuxArm64()
 nativeUtils.wpi.configureDependencies {
     wpiVersion = wpilibVersion
     wpimathVersion = wpilibVersion
-    niLibVersion = "2023.3.0"
+    niLibVersion = "2024.1.1"
     opencvYear = 'frc2024'
     opencvVersion = openCVversion
     googleTestYear = "frc2023"