diff --git a/MODULE.bazel b/MODULE.bazel index 7d8b83b45..432b78913 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -50,7 +50,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.4") maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( diff --git a/examples/android/WORKSPACE b/examples/android/WORKSPACE index 48e9317de..6f1476bc0 100644 --- a/examples/android/WORKSPACE +++ b/examples/android/WORKSPACE @@ -29,7 +29,7 @@ http_archive( name = "rules_jvm_external", sha256 = versions.RULES_JVM_EXTERNAL_SHA, strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( + url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG, ), diff --git a/examples/anvil/WORKSPACE b/examples/anvil/WORKSPACE index 45f76a7e4..bbcae43e4 100644 --- a/examples/anvil/WORKSPACE +++ b/examples/anvil/WORKSPACE @@ -50,7 +50,7 @@ http_archive( name = "rules_jvm_external", sha256 = versions.RULES_JVM_EXTERNAL_SHA, strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( + url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG, ), diff --git a/examples/associates/WORKSPACE b/examples/associates/WORKSPACE index 8758e4863..a0f7d18ad 100644 --- a/examples/associates/WORKSPACE +++ b/examples/associates/WORKSPACE @@ -36,7 +36,7 @@ http_archive( name = "rules_jvm_external", sha256 = versions.RULES_JVM_EXTERNAL_SHA, strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( + url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG, ), diff --git a/examples/dagger/WORKSPACE b/examples/dagger/WORKSPACE index e75d500a3..93e8c3ecc 100644 --- a/examples/dagger/WORKSPACE +++ b/examples/dagger/WORKSPACE @@ -30,7 +30,7 @@ http_archive( name = "rules_jvm_external", sha256 = versions.RULES_JVM_EXTERNAL_SHA, strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( + url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG, ), diff --git a/examples/deps/WORKSPACE b/examples/deps/WORKSPACE index c2ac1fca6..a5acebdba 100644 --- a/examples/deps/WORKSPACE +++ b/examples/deps/WORKSPACE @@ -27,7 +27,7 @@ http_archive( name = "rules_jvm_external", sha256 = versions.RULES_JVM_EXTERNAL_SHA, strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( + url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG, ), diff --git a/examples/jetpack_compose/WORKSPACE b/examples/jetpack_compose/WORKSPACE index 500ffc505..0da3f58cd 100644 --- a/examples/jetpack_compose/WORKSPACE +++ b/examples/jetpack_compose/WORKSPACE @@ -31,7 +31,7 @@ http_archive( name = "rules_jvm_external", sha256 = versions.RULES_JVM_EXTERNAL_SHA, strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( + url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG, ), diff --git a/examples/ksp/WORKSPACE b/examples/ksp/WORKSPACE index a728fb17d..f6a08055b 100644 --- a/examples/ksp/WORKSPACE +++ b/examples/ksp/WORKSPACE @@ -31,7 +31,7 @@ http_archive( name = "rules_jvm_external", sha256 = versions.RULES_JVM_EXTERNAL_SHA, strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( + url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG, ), diff --git a/examples/plugin/WORKSPACE b/examples/plugin/WORKSPACE index 099b10ccf..34193800e 100644 --- a/examples/plugin/WORKSPACE +++ b/examples/plugin/WORKSPACE @@ -20,7 +20,7 @@ http_archive( name = "rules_jvm_external", sha256 = versions.RULES_JVM_EXTERNAL_SHA, strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( + url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG, ), diff --git a/examples/trivial/WORKSPACE b/examples/trivial/WORKSPACE index f6ebd0868..d7854fb94 100644 --- a/examples/trivial/WORKSPACE +++ b/examples/trivial/WORKSPACE @@ -20,7 +20,7 @@ http_archive( name = "rules_jvm_external", sha256 = versions.RULES_JVM_EXTERNAL_SHA, strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( + url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % ( versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG, ), diff --git a/src/main/starlark/core/repositories/download.bzl b/src/main/starlark/core/repositories/download.bzl index 0a5b3f312..e0394aea1 100644 --- a/src/main/starlark/core/repositories/download.bzl +++ b/src/main/starlark/core/repositories/download.bzl @@ -56,7 +56,7 @@ def kt_download_local_dev_dependencies(): name = "rules_jvm_external", sha256 = versions.RULES_JVM_EXTERNAL_SHA, strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG), + url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (versions.RULES_JVM_EXTERNAL_TAG, versions.RULES_JVM_EXTERNAL_TAG), ) versions.use_repository( diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl index 3b3e7089e..a6f2cb66d 100644 --- a/src/main/starlark/core/repositories/versions.bzl +++ b/src/main/starlark/core/repositories/versions.bzl @@ -35,8 +35,8 @@ versions = struct( SKYLIB_SHA = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa", PROTOBUF_VERSION = "3.11.3", PROTOBUF_SHA = "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852", - RULES_JVM_EXTERNAL_TAG = "5.3", - RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac", + RULES_JVM_EXTERNAL_TAG = "6.4", + RULES_JVM_EXTERNAL_SHA = "85776be6d8fe64abf26f463a8e12cd4c15be927348397180a01693610da7ec90", RULES_PROTO = version( version = "5.3.0-21.7", sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd", @@ -118,12 +118,12 @@ versions = struct( sha256 = "eb7db63ed826567b2ceb1ec53d6b729e01636f72c9f5dfb6d2dfe55ad69d1d2a", ), RULES_LICENSE = version( - version = "0.0.3", + version = "1.0.0", url_templates = [ "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/{version}/rules_license-{version}.tar.gz", "https://github.com/bazelbuild/rules_license/releases/download/{version}/rules_license-{version}.tar.gz", ], - sha256 = None, + sha256 = "26d4021f6898e23b82ef953078389dd49ac2b5618ac564ade4ef87cced147b38", ), RULES_TESTING = version( version = "0.5.0",