From 6ad3d541314cf09d7dc3b72ff77cf7d3988e43bd Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Fri, 11 Aug 2023 08:55:20 -0700 Subject: [PATCH 1/4] Update rules_jvm_external to 5.3 --- src/main/starlark/core/repositories/versions.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl index 5ee0999de..74979ce1b 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 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728", PROTOBUF_VERSION = "3.11.3", PROTOBUF_SHA = "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852", - RULES_JVM_EXTERNAL_TAG = "4.4.2", - RULES_JVM_EXTERNAL_SHA = "735602f50813eb2ea93ca3f5e43b1959bd80b213b836a07a62a29d757670b77b", + RULES_JVM_EXTERNAL_TAG = "5.3", + RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac", RULES_PROTO = version( version = "5.3.0-21.7", sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd", From b95511d705bed87645a32abc7391e1eee75a0000 Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Fri, 11 Aug 2023 09:01:11 -0700 Subject: [PATCH 2/4] Fix the URL for rules_jvm_external --- src/main/starlark/core/repositories/download.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/starlark/core/repositories/download.bzl b/src/main/starlark/core/repositories/download.bzl index 2aa8d703c..0ce95d020 100644 --- a/src/main/starlark/core/repositories/download.bzl +++ b/src/main/starlark/core/repositories/download.bzl @@ -63,7 +63,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/archive/%s.zip" % 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), ) versions.use_repository( From b10d279bb84263c36fd98b1a00e9a73e32c8da9e Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Fri, 11 Aug 2023 09:05:38 -0700 Subject: [PATCH 3/4] More URL fixes --- examples/android/WORKSPACE | 2 +- examples/anvil/WORKSPACE | 2 +- examples/associates/WORKSPACE | 2 +- examples/dagger/WORKSPACE | 2 +- examples/deps/WORKSPACE | 2 +- examples/jetpack_compose/WORKSPACE | 2 +- examples/ksp/WORKSPACE | 2 +- examples/node/WORKSPACE | 2 +- examples/plugin/WORKSPACE | 2 +- examples/trivial/WORKSPACE | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/android/WORKSPACE b/examples/android/WORKSPACE index fa8c4f0c1..4b34f2cd1 100644 --- a/examples/android/WORKSPACE +++ b/examples/android/WORKSPACE @@ -33,7 +33,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/archive/%s.zip" % 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), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/anvil/WORKSPACE b/examples/anvil/WORKSPACE index d1a1b25e0..2bdb9e093 100644 --- a/examples/anvil/WORKSPACE +++ b/examples/anvil/WORKSPACE @@ -51,7 +51,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/archive/%s.zip" % 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), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/associates/WORKSPACE b/examples/associates/WORKSPACE index a08b43dbf..cd464961d 100644 --- a/examples/associates/WORKSPACE +++ b/examples/associates/WORKSPACE @@ -39,7 +39,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/archive/%s.zip" % 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), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/dagger/WORKSPACE b/examples/dagger/WORKSPACE index 356538adf..1c7a609dd 100644 --- a/examples/dagger/WORKSPACE +++ b/examples/dagger/WORKSPACE @@ -21,7 +21,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/archive/%s.zip" % 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), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/deps/WORKSPACE b/examples/deps/WORKSPACE index c84a4edb9..4679c50f5 100644 --- a/examples/deps/WORKSPACE +++ b/examples/deps/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/archive/%s.zip" % 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), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/jetpack_compose/WORKSPACE b/examples/jetpack_compose/WORKSPACE index 0bcb0dbab..9474299cc 100644 --- a/examples/jetpack_compose/WORKSPACE +++ b/examples/jetpack_compose/WORKSPACE @@ -38,7 +38,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/archive/%s.zip" % 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), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/ksp/WORKSPACE b/examples/ksp/WORKSPACE index 44a8fb20b..6d99e60d4 100644 --- a/examples/ksp/WORKSPACE +++ b/examples/ksp/WORKSPACE @@ -32,7 +32,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/archive/%s.zip" % 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), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/node/WORKSPACE b/examples/node/WORKSPACE index 606684823..eae5210c0 100644 --- a/examples/node/WORKSPACE +++ b/examples/node/WORKSPACE @@ -25,7 +25,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/archive/%s.zip" % 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), ) http_archive( diff --git a/examples/plugin/WORKSPACE b/examples/plugin/WORKSPACE index 6d523a040..0c31d6938 100644 --- a/examples/plugin/WORKSPACE +++ b/examples/plugin/WORKSPACE @@ -23,7 +23,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/archive/%s.zip" % 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), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/trivial/WORKSPACE b/examples/trivial/WORKSPACE index 90eb8a48f..27d7d0739 100644 --- a/examples/trivial/WORKSPACE +++ b/examples/trivial/WORKSPACE @@ -23,7 +23,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/archive/%s.zip" % 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), ) load("@rules_jvm_external//:defs.bzl", "maven_install") From 2205ecd75edc1d1cdc3e8ba86f3e609cd125eca1 Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Fri, 11 Aug 2023 09:08:55 -0700 Subject: [PATCH 4/4] Formatting --- examples/android/WORKSPACE | 5 ++++- examples/anvil/WORKSPACE | 5 ++++- examples/associates/WORKSPACE | 5 ++++- examples/dagger/WORKSPACE | 5 ++++- examples/deps/WORKSPACE | 5 ++++- examples/jetpack_compose/WORKSPACE | 5 ++++- examples/ksp/WORKSPACE | 5 ++++- examples/node/WORKSPACE | 5 ++++- examples/plugin/WORKSPACE | 5 ++++- examples/trivial/WORKSPACE | 5 ++++- 10 files changed, 40 insertions(+), 10 deletions(-) diff --git a/examples/android/WORKSPACE b/examples/android/WORKSPACE index 4b34f2cd1..ab1bc65b9 100644 --- a/examples/android/WORKSPACE +++ b/examples/android/WORKSPACE @@ -33,7 +33,10 @@ 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" % (versions.RULES_JVM_EXTERNAL_TAG, 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, + ), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/anvil/WORKSPACE b/examples/anvil/WORKSPACE index 2bdb9e093..1d668ae03 100644 --- a/examples/anvil/WORKSPACE +++ b/examples/anvil/WORKSPACE @@ -51,7 +51,10 @@ 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" % (versions.RULES_JVM_EXTERNAL_TAG, 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, + ), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/associates/WORKSPACE b/examples/associates/WORKSPACE index cd464961d..2c83af27f 100644 --- a/examples/associates/WORKSPACE +++ b/examples/associates/WORKSPACE @@ -39,7 +39,10 @@ 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" % (versions.RULES_JVM_EXTERNAL_TAG, 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, + ), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/dagger/WORKSPACE b/examples/dagger/WORKSPACE index 1c7a609dd..9339a888a 100644 --- a/examples/dagger/WORKSPACE +++ b/examples/dagger/WORKSPACE @@ -21,7 +21,10 @@ 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" % (versions.RULES_JVM_EXTERNAL_TAG, 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, + ), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/deps/WORKSPACE b/examples/deps/WORKSPACE index 4679c50f5..533055d22 100644 --- a/examples/deps/WORKSPACE +++ b/examples/deps/WORKSPACE @@ -31,7 +31,10 @@ 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" % (versions.RULES_JVM_EXTERNAL_TAG, 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, + ), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/jetpack_compose/WORKSPACE b/examples/jetpack_compose/WORKSPACE index 9474299cc..278c312a2 100644 --- a/examples/jetpack_compose/WORKSPACE +++ b/examples/jetpack_compose/WORKSPACE @@ -38,7 +38,10 @@ 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" % (versions.RULES_JVM_EXTERNAL_TAG, 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, + ), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/ksp/WORKSPACE b/examples/ksp/WORKSPACE index 6d99e60d4..078721755 100644 --- a/examples/ksp/WORKSPACE +++ b/examples/ksp/WORKSPACE @@ -32,7 +32,10 @@ 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" % (versions.RULES_JVM_EXTERNAL_TAG, 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, + ), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/node/WORKSPACE b/examples/node/WORKSPACE index eae5210c0..57cc23a99 100644 --- a/examples/node/WORKSPACE +++ b/examples/node/WORKSPACE @@ -25,7 +25,10 @@ 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" % (versions.RULES_JVM_EXTERNAL_TAG, 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, + ), ) http_archive( diff --git a/examples/plugin/WORKSPACE b/examples/plugin/WORKSPACE index 0c31d6938..8dc608912 100644 --- a/examples/plugin/WORKSPACE +++ b/examples/plugin/WORKSPACE @@ -23,7 +23,10 @@ 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" % (versions.RULES_JVM_EXTERNAL_TAG, 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, + ), ) load("@rules_jvm_external//:defs.bzl", "maven_install") diff --git a/examples/trivial/WORKSPACE b/examples/trivial/WORKSPACE index 27d7d0739..75435ae87 100644 --- a/examples/trivial/WORKSPACE +++ b/examples/trivial/WORKSPACE @@ -23,7 +23,10 @@ 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" % (versions.RULES_JVM_EXTERNAL_TAG, 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, + ), ) load("@rules_jvm_external//:defs.bzl", "maven_install")