From 00a0be0dc278585c636ffb06e8f79bb7f1001f9f Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Tue, 16 Jul 2024 10:06:20 -0700 Subject: [PATCH 1/2] Updpate rules_jvm_external to 6.2 --- MODULE.bazel | 2 +- src/main/starlark/core/repositories/versions.bzl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 3ae063e51..ad1cca8e6 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -47,7 +47,7 @@ use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools") # TODO(bencodes) A bunch of these dependencies need to be marked as dev_dependencies but before we can do that # we need to sort out a few cases around how these rules are consumed in various ways. -bazel_dep(name = "rules_jvm_external", version = "5.3") +bazel_dep(name = "rules_jvm_external", version = "6.2") maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl index 88c8b0864..3059afdc2 100644 --- a/src/main/starlark/core/repositories/versions.bzl +++ b/src/main/starlark/core/repositories/versions.bzl @@ -33,8 +33,8 @@ versions = struct( SKYLIB_SHA = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f", PROTOBUF_VERSION = "3.11.3", PROTOBUF_SHA = "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852", - RULES_JVM_EXTERNAL_TAG = "5.3", - RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac", + RULES_JVM_EXTERNAL_TAG = "6.2", + RULES_JVM_EXTERNAL_SHA = "808cb5c30b5f70d12a2a745a29edc46728fd35fa195c1762a596b63ae9cebe05", RULES_PROTO = version( version = "5.3.0-21.7", sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd", From 5ec12b70658125a1d15b7497595b1645dd2f0a37 Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Tue, 16 Jul 2024 10:07:08 -0700 Subject: [PATCH 2/2] Update the examples --- examples/android/MODULE.bazel | 2 +- examples/multiplex/MODULE.bazel | 2 +- examples/trivial/MODULE.bazel | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/android/MODULE.bazel b/examples/android/MODULE.bazel index 6eb68a3fa..88f949dc1 100644 --- a/examples/android/MODULE.bazel +++ b/examples/android/MODULE.bazel @@ -14,7 +14,7 @@ local_path_override( path = "../..", ) -bazel_dep(name = "rules_jvm_external", version = "5.3") +bazel_dep(name = "rules_jvm_external", version = "6.2") maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( diff --git a/examples/multiplex/MODULE.bazel b/examples/multiplex/MODULE.bazel index 51e1ca218..b4d9e40b1 100644 --- a/examples/multiplex/MODULE.bazel +++ b/examples/multiplex/MODULE.bazel @@ -10,7 +10,7 @@ local_path_override( path = "../..", ) -bazel_dep(name = "rules_jvm_external", version = "5.3") +bazel_dep(name = "rules_jvm_external", version = "6.2") maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( diff --git a/examples/trivial/MODULE.bazel b/examples/trivial/MODULE.bazel index 1e504094e..c6321ed93 100644 --- a/examples/trivial/MODULE.bazel +++ b/examples/trivial/MODULE.bazel @@ -7,7 +7,7 @@ local_path_override( path = "../..", ) -bazel_dep(name = "rules_jvm_external", version = "5.3") +bazel_dep(name = "rules_jvm_external", version = "6.2") maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install(