Fixup

snobotsim · Jan 4, 2025 · 86cd41d · 86cd41d
1 parent 8948606
commit 86cd41d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v4
       with:
-        distribution: 'zulu'
+        distribution: 'temurin'
         java-version: 17
         architecture: ${{ matrix.platform.architecture }}
 

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -16,6 +16,7 @@ archive_override(
     strip_prefix = "rules_bzlmodrio_jdk-4ecd4cbc97dfbfe2ceefa627de1228e2f2ca5773",
     urls = ["https://github.com/wpilibsuite/rules_bzlmodRio_jdk/archive/4ecd4cbc97dfbfe2ceefa627de1228e2f2ca5773.tar.gz"],
 )
+
 archive_override(
     module_name = "bzlmodrio-studica",
     integrity = "sha256-Uw+1yI3vh/6G20kcjmH+c/tUNTMPgx05cjs3mBd3etY=",

diff --git a/WORKSPACE b/WORKSPACE
@@ -8,6 +8,13 @@ http_archive(
     urls = ["https://github.com/wpilibsuite/rules_bzlmodRio_jdk/archive/d5f0db20a611e4ec4b26f95d9c772e2436b69b55.tar.gz"],
 )
 
+http_archive(
+    name = "bzlmodrio-studica",
+    sha256 = "530fb5c88def87fe86db491c8e61fe73fb5435330f831d39723b379817777ad6",
+    strip_prefix = "bzlmodRio-studica-b190c1fcfaf6e2fd242e934c5109a1073ff84082",
+    urls = ["https://github.com/bzlmodrio/bzlmodRio-studica/archive/b190c1fcfaf6e2fd242e934c5109a1073ff84082.tar.gz"],
+)
+
 download_external_archives()
 
 load("//build_scripts/bazel/deps:setup_dependencies.bzl", "setup_dependencies")

diff --git a/examples/test_robot_catchall/src/main/java/org/snobotv2/examples/catchall/subsystems/BUILD b/examples/test_robot_catchall/src/main/java/org/snobotv2/examples/catchall/subsystems/BUILD
@@ -7,8 +7,8 @@ snobot_sim_java_library(
     deps = [
         "@bzlmodrio-allwpilib//libraries/java/wpilibNewCommands",
         "@bzlmodrio-allwpilib//libraries/java/wpilibj",
-        "@bzlmodrio-studica//libraries/java/studica-java",
         "@bzlmodrio-phoenix//libraries/java/wpiapi-java",
         "@bzlmodrio-revlib//libraries/java/revlib-java",
+        "@bzlmodrio-studica//libraries/java/studica-java",
     ],
 )
diff --git a/examples/test_robot_rev/src/main/java/org/snobotv2/examples/rev/subsystems/BUILD b/examples/test_robot_rev/src/main/java/org/snobotv2/examples/rev/subsystems/BUILD
@@ -18,7 +18,7 @@ snobot_sim_java_library(
         "@bzlmodrio-allwpilib//libraries/java/wpilibNewCommands",
         "@bzlmodrio-allwpilib//libraries/java/wpilibj",
         "@bzlmodrio-allwpilib//libraries/java/wpimath",
-        "@bzlmodrio-studica//libraries/java/studica-java",
         "@bzlmodrio-revlib//libraries/java/revlib-java",
+        "@bzlmodrio-studica//libraries/java/studica-java",
     ],
 )