diff --git a/MODULE.bazel b/MODULE.bazel index cbde9e7..37bee33 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "rules_bzlmodrio_jdk", - version = "17.0.8.1-1", + version = "17.0.12-7", compatibility_level = 2024, ) @@ -9,7 +9,7 @@ bazel_dep(name = "rules_java", version = "7.6.5") deps = use_extension("//:maven_deps.bzl", "deps") -bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1") +bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1.bcr1") REMOTE_JDK_REPOS = [ "roboriojdk_linux", diff --git a/maven_deps.bzl b/maven_deps.bzl index 4bca993..9d0f766 100644 --- a/maven_deps.bzl +++ b/maven_deps.bzl @@ -9,9 +9,9 @@ def __setup_jdk_dependencies(mctx): "@platforms//os:linux", "@platforms//cpu:x86_64", ], - sha256 = "c25dfbc334068a48c19c44ce39ad4b8427e309ae1cfa83f23c102e78b8a6dcc0", - urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.8.1_1.tar.gz"], - strip_prefix = "jdk-17.0.8.1+1", + sha256 = "9d4dd339bf7e6a9dcba8347661603b74c61ab2a5083ae67bf76da6285da8a778", + urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz"], + strip_prefix = "jdk-17.0.12+7", ) remote_java_repository( @@ -22,9 +22,9 @@ def __setup_jdk_dependencies(mctx): "@platforms//os:linux", "@platforms//cpu:armv7", ], - sha256 = "eefd3cf3b3dd47ff269fa5b5c10b5e096b163f4e9c1810023abdbc00dc6cc304", - urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.8.1_1.tar.gz"], - strip_prefix = "jdk-17.0.8.1+1", + sha256 = "8257de06bf37f0c8f19f8d542e2ab5a4e17db3ca5f29d041bd0b02ab265db021", + urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz"], + strip_prefix = "jdk-17.0.12+7", ) remote_java_repository( @@ -35,9 +35,9 @@ def __setup_jdk_dependencies(mctx): "@platforms//os:macos", "@platforms//cpu:x86_64", ], - sha256 = "18be56732c1692ef131625d814dcb02ee091a43fdd6f214a33d87cc14842fc3f", - urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_x64_mac_hotspot_17.0.8.1_1.tar.gz"], - strip_prefix = "jdk-17.0.8.1+1/Contents/Home", + sha256 = "d5230eeec88739aa7133e4c8635bbd4ab226708c12deaafa13cf26b02bc8e8c4", + urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz"], + strip_prefix = "jdk-17.0.12+7/Contents/Home", ) remote_java_repository( @@ -48,9 +48,9 @@ def __setup_jdk_dependencies(mctx): "@platforms//os:macos", "@platforms//cpu:aarch64", ], - sha256 = "2e95eed48650f00650e963c8213b6c6ecda54458edf8d254ebc99d6a6966ffad", - urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.8.1_1.tar.gz"], - strip_prefix = "jdk-17.0.8.1+1/Contents/Home", + sha256 = "d7910b1acaeb290c5c5da21811d2b2b8635f806612a2d6e8d1953b2f77580f78", + urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz"], + strip_prefix = "jdk-17.0.12+7/Contents/Home", ) remote_java_repository( @@ -61,9 +61,9 @@ def __setup_jdk_dependencies(mctx): "@platforms//os:windows", # Assume JDK works for any CPU, ], - sha256 = "651a795155dc918c06cc9fd4b37253b9cbbca5ec8e76d4a8fa7cdaeb1f52761c", - urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_x64_windows_hotspot_17.0.8.1_1.zip"], - strip_prefix = "jdk-17.0.8.1+1", + sha256 = "052049d687ebfda6a4032d54afcd0da6549a23bc2ed04cfaa509746eeacbae71", + urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.zip"], + strip_prefix = "jdk-17.0.12+7", ) def setup_legacy_setup_jdk_dependencies(): diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel index d6c2dde..df01a9f 100644 --- a/tests/MODULE.bazel +++ b/tests/MODULE.bazel @@ -6,7 +6,7 @@ local_path_override( bazel_dep(name = "rules_java", version = "7.6.5") bazel_dep(name = "rules_jvm_external", version = "6.1") -bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1") +bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1.bcr1") bazel_dep(name = "rules_checkstyle", version = "10.12.2") bazel_dep(name = "rules_pmd", version = "7.2.0") bazel_dep(name = "rules_spotless", version = "2.40.0") diff --git a/tests/WORKSPACE b/tests/WORKSPACE index 81dbb8f..ac63a14 100644 --- a/tests/WORKSPACE +++ b/tests/WORKSPACE @@ -28,8 +28,8 @@ http_archive( http_archive( name = "rules_bzlmodrio_toolchains", - sha256 = "cd3ff046427e9c6dbc0c86a458c8cf081b8045fc3fb4265d08c0ebfc17f9cb30", - url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2024-1/rules_bzlmodRio_toolchains-2024-1.tar.gz", + sha256 = "2ef1cafce7f4fd4e909bb5de8b0dc771a934646afd55d5f100ff31f6b500df98", + url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2024-1.bcr1/rules_bzlmodRio_toolchains-2024-1.bcr1.tar.gz", ) load("@rules_jvm_external//:defs.bzl", "maven_install")