From 1bf8f64b5b74d7ffc9463993f55ecc93c5130fbc Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Fri, 9 Aug 2024 13:17:41 -0700 Subject: [PATCH 1/6] Update rules_android to 0.5.1 --- .bazelrc | 1 + MODULE.bazel | 2 +- MODULE.release.bazel | 2 +- examples/android/MODULE.bazel | 2 +- examples/android/WORKSPACE | 4 ++-- examples/anvil/WORKSPACE | 4 ++-- examples/associates/WORKSPACE | 6 +++--- examples/deps/WORKSPACE | 4 ++-- examples/jetpack_compose/WORKSPACE | 4 ++-- kotlin/internal/jvm/android.bzl | 2 +- src/main/starlark/core/repositories/download.bzl | 4 ++-- .../starlark/core/repositories/initialize.release.bzl | 6 +++--- src/main/starlark/core/repositories/versions.bzl | 10 ++++++---- 13 files changed, 27 insertions(+), 24 deletions(-) diff --git a/.bazelrc b/.bazelrc index b78cc0044..c574299d6 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,4 +1,5 @@ common --enable_bzlmod=true +common --experimental_google_legacy_api common:rbe --java_runtime_version=11 common:rbe --tool_java_runtime_version=11 diff --git a/MODULE.bazel b/MODULE.bazel index 273d8bd9b..197ca9c6b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -10,7 +10,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "rules_java", version = "7.2.0") bazel_dep(name = "rules_python", version = "0.23.1") bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_android", version = "0.1.1") +bazel_dep(name = "rules_android", version = "0.5.1") rules_kotlin_extensions = use_extension("//src/main/starlark/core/repositories:bzlmod_setup.bzl", "rules_kotlin_extensions") use_repo( diff --git a/MODULE.release.bazel b/MODULE.release.bazel index b2348946a..1df129b64 100644 --- a/MODULE.release.bazel +++ b/MODULE.release.bazel @@ -10,7 +10,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "rules_java", version = "7.2.0") bazel_dep(name = "rules_python", version = "0.23.1") bazel_dep(name = "rules_cc", version = "0.0.8") -bazel_dep(name = "rules_android", version = "0.1.1") +bazel_dep(name = "rules_android", version = "0.5.1") rules_kotlin_extensions = use_extension( "//src/main/starlark/core/repositories:bzlmod_setup.bzl", diff --git a/examples/android/MODULE.bazel b/examples/android/MODULE.bazel index 9c8a8a55e..33d28c737 100644 --- a/examples/android/MODULE.bazel +++ b/examples/android/MODULE.bazel @@ -3,7 +3,7 @@ module(name = "android-example") remote_android_extensions = use_extension("@bazel_tools//tools/android:android_extensions.bzl", "remote_android_tools_extensions") use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools") -bazel_dep(name = "rules_android", version = "0.1.1") +bazel_dep(name = "rules_android", version = "0.5.1") bazel_dep(name = "bazel_skylib", version = "1.2.1") bazel_dep(name = "rules_robolectric", version = "4.10.3", repo_name = "robolectric") bazel_dep(name = "rules_java", version = "6.4.0") diff --git a/examples/android/WORKSPACE b/examples/android/WORKSPACE index 48e9317de..badf5dc2b 100644 --- a/examples/android/WORKSPACE +++ b/examples/android/WORKSPACE @@ -62,9 +62,9 @@ maven_install( http_archive( name = "rules_android", - sha256 = versions.ANDROID.SHA, + sha256 = versions.ANDROID.sha256, strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION], + urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], ) load( diff --git a/examples/anvil/WORKSPACE b/examples/anvil/WORKSPACE index 45f76a7e4..f3baba825 100644 --- a/examples/anvil/WORKSPACE +++ b/examples/anvil/WORKSPACE @@ -16,9 +16,9 @@ kt_register_toolchains() http_archive( name = "rules_android", - sha256 = versions.ANDROID.SHA, + sha256 = versions.ANDROID.sha256, strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION], + urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], ) load("@rules_android//android:rules.bzl", "android_sdk_repository") diff --git a/examples/associates/WORKSPACE b/examples/associates/WORKSPACE index 8758e4863..a146033fa 100644 --- a/examples/associates/WORKSPACE +++ b/examples/associates/WORKSPACE @@ -18,9 +18,9 @@ load("@rules_kotlin//src/main/starlark/core/repositories:versions.bzl", "version http_archive( name = "rules_android", - sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806", - strip_prefix = "rules_android-0.1.1", - urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"], + sha256 = versions.ANDROID.sha256, + strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, + urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], ) http_archive( diff --git a/examples/deps/WORKSPACE b/examples/deps/WORKSPACE index c2ac1fca6..21331bc66 100644 --- a/examples/deps/WORKSPACE +++ b/examples/deps/WORKSPACE @@ -57,9 +57,9 @@ maven_install( http_archive( name = "rules_android", - sha256 = versions.ANDROID.SHA, + sha256 = versions.ANDROID.sha256, strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION], + urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], ) load( diff --git a/examples/jetpack_compose/WORKSPACE b/examples/jetpack_compose/WORKSPACE index 500ffc505..ae4ff22f1 100644 --- a/examples/jetpack_compose/WORKSPACE +++ b/examples/jetpack_compose/WORKSPACE @@ -70,9 +70,9 @@ http_archive( http_archive( name = "rules_android", - sha256 = versions.ANDROID.SHA, + sha256 = versions.ANDROID.sha256, strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION], + urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], ) load("@rules_android//android:rules.bzl", "android_sdk_repository") diff --git a/kotlin/internal/jvm/android.bzl b/kotlin/internal/jvm/android.bzl index 20c6b51e6..34eec6faa 100644 --- a/kotlin/internal/jvm/android.bzl +++ b/kotlin/internal/jvm/android.bzl @@ -21,7 +21,7 @@ load( _kt_jvm_library = "kt_jvm_library", ) -_ANDROID_SDK_JAR = "%s" % Label("//third_party:android_sdk") +_ANDROID_SDK_JAR = "%s" % Label("@rules_android//third_party:android_sdk") def _kt_android_artifact( name, diff --git a/src/main/starlark/core/repositories/download.bzl b/src/main/starlark/core/repositories/download.bzl index 0a5b3f312..909c0c635 100644 --- a/src/main/starlark/core/repositories/download.bzl +++ b/src/main/starlark/core/repositories/download.bzl @@ -79,9 +79,9 @@ def kt_download_local_dev_dependencies(): rules_stardoc_repository( name = "rules_android", - sha256 = versions.ANDROID.SHA, + sha256 = versions.ANDROID.sha256, strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = versions.ANDROID.URLS, + urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], starlark_packages = [ "android", ], diff --git a/src/main/starlark/core/repositories/initialize.release.bzl b/src/main/starlark/core/repositories/initialize.release.bzl index 1e97424c1..144a03b4a 100644 --- a/src/main/starlark/core/repositories/initialize.release.bzl +++ b/src/main/starlark/core/repositories/initialize.release.bzl @@ -75,11 +75,11 @@ def kotlin_repositories( return maybe( - http_archive, + http_file, name = "rules_android", - sha256 = versions.ANDROID.SHA, + sha256 = versions.ANDROID.sha256, strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = versions.ANDROID.URLS, + urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], ) versions.use_repository( diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl index 18e055c3a..c6f54662b 100644 --- a/src/main/starlark/core/repositories/versions.bzl +++ b/src/main/starlark/core/repositories/versions.bzl @@ -74,10 +74,12 @@ versions = struct( ], sha256 = "84100aed5b63effa992ce6574b3ba47d2dbb78529752daa4c181e203117ba7de", ), - ANDROID = struct( - VERSION = "0.1.1", - SHA = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806", - URLS = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % "0.1.1"], + ANDROID = version( + version = "0.5.1", + url_templates = [ + "https://github.com/bazelbuild/rules_android/releases/download/v{}/rules_android-v{}.tar.gz", + ], + sha256 = "ee0618755913ef7fd6511288a232e8fad24838b9af6ea73972a76e81053c8c2d", ), # To update: https://github.com/bazelbuild/bazel-toolchains#latest-bazel-and-latest-ubuntu-1604-container RBE = struct( From dceee7e9d7c8077b381af5249030f016b0f0e8a3 Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Fri, 9 Aug 2024 13:18:55 -0700 Subject: [PATCH 2/6] Revert --- kotlin/internal/jvm/android.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kotlin/internal/jvm/android.bzl b/kotlin/internal/jvm/android.bzl index 34eec6faa..20c6b51e6 100644 --- a/kotlin/internal/jvm/android.bzl +++ b/kotlin/internal/jvm/android.bzl @@ -21,7 +21,7 @@ load( _kt_jvm_library = "kt_jvm_library", ) -_ANDROID_SDK_JAR = "%s" % Label("@rules_android//third_party:android_sdk") +_ANDROID_SDK_JAR = "%s" % Label("//third_party:android_sdk") def _kt_android_artifact( name, From 9014256bde122d42bf113bdb91c18b5de7fe7ee4 Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Fri, 9 Aug 2024 13:21:00 -0700 Subject: [PATCH 3/6] Update rules_jvm_external to 6.2 --- MODULE.bazel | 2 +- examples/android/MODULE.bazel | 2 +- examples/multiplex/MODULE.bazel | 2 +- examples/trivial/MODULE.bazel | 15 +++------------ src/main/starlark/core/repositories/versions.bzl | 4 ++-- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 197ca9c6b..d05613151 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -48,7 +48,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/examples/android/MODULE.bazel b/examples/android/MODULE.bazel index 33d28c737..5aa67063d 100644 --- a/examples/android/MODULE.bazel +++ b/examples/android/MODULE.bazel @@ -9,7 +9,7 @@ bazel_dep(name = "rules_robolectric", version = "4.10.3", repo_name = "robolectr bazel_dep(name = "rules_java", version = "6.4.0") bazel_dep(name = "platforms", version = "0.0.7") bazel_dep(name = "rules_kotlin", version = "1.9.5") -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 2161fecfb..40b56eb57 100644 --- a/examples/multiplex/MODULE.bazel +++ b/examples/multiplex/MODULE.bazel @@ -5,7 +5,7 @@ use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools") bazel_dep(name = "rules_java", version = "6.4.0") bazel_dep(name = "rules_kotlin", version = "1.9.5") -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 fdc066dbd..cae40ad2a 100644 --- a/examples/trivial/MODULE.bazel +++ b/examples/trivial/MODULE.bazel @@ -1,17 +1,8 @@ module(name = "trival-example") -bazel_dep( - name = "rules_java", - version = "6.4.0", -) -bazel_dep( - name = "rules_kotlin", - version = "1.9.5", -) -bazel_dep( - name = "rules_jvm_external", - version = "5.3", -) +bazel_dep(name = "rules_java", version = "6.4.0") +bazel_dep(name = "rules_kotlin", version = "1.9.5") +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 c6f54662b..e46f46b10 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.2", + RULES_JVM_EXTERNAL_SHA = "808cb5c30b5f70d12a2a745a29edc46728fd35fa195c1762a596b63ae9cebe05", RULES_PROTO = version( version = "5.3.0-21.7", sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd", From 991c9bbb5b6cf0606c8e1128ae0541f10a935d1c Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Fri, 9 Aug 2024 13:26:06 -0700 Subject: [PATCH 4/6] Fixes --- examples/android/.bazelrc | 1 + examples/android/WORKSPACE | 4 ++-- examples/anvil/WORKSPACE | 4 ++-- examples/associates/WORKSPACE | 4 ++-- examples/deps/WORKSPACE | 4 ++-- examples/jetpack_compose/WORKSPACE | 4 ++-- examples/plugin/.bazelrc | 1 + examples/trivial/.bazelrc | 1 + src/main/starlark/core/repositories/download.bzl | 4 ++-- src/main/starlark/core/repositories/initialize.release.bzl | 4 ++-- 10 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 examples/plugin/.bazelrc create mode 100644 examples/trivial/.bazelrc diff --git a/examples/android/.bazelrc b/examples/android/.bazelrc index dee422d77..eab502035 100644 --- a/examples/android/.bazelrc +++ b/examples/android/.bazelrc @@ -1,2 +1,3 @@ common --lockfile_mode=off +common --experimental_google_legacy_api test --test_output=all \ No newline at end of file diff --git a/examples/android/WORKSPACE b/examples/android/WORKSPACE index badf5dc2b..29323b703 100644 --- a/examples/android/WORKSPACE +++ b/examples/android/WORKSPACE @@ -63,8 +63,8 @@ maven_install( http_archive( name = "rules_android", sha256 = versions.ANDROID.sha256, - strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], + strip_prefix = "rules_android-%s" % versions.ANDROID.version, + urls = [url.format(version = versions.ANDROID.version) for url in versions.ANDROID.url_templates], ) load( diff --git a/examples/anvil/WORKSPACE b/examples/anvil/WORKSPACE index f3baba825..e719d45ef 100644 --- a/examples/anvil/WORKSPACE +++ b/examples/anvil/WORKSPACE @@ -17,8 +17,8 @@ kt_register_toolchains() http_archive( name = "rules_android", sha256 = versions.ANDROID.sha256, - strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], + strip_prefix = "rules_android-%s" % versions.ANDROID.version, + urls = [url.format(version = versions.ANDROID.version) for url in versions.ANDROID.url_templates], ) load("@rules_android//android:rules.bzl", "android_sdk_repository") diff --git a/examples/associates/WORKSPACE b/examples/associates/WORKSPACE index a146033fa..66d944c70 100644 --- a/examples/associates/WORKSPACE +++ b/examples/associates/WORKSPACE @@ -19,8 +19,8 @@ load("@rules_kotlin//src/main/starlark/core/repositories:versions.bzl", "version http_archive( name = "rules_android", sha256 = versions.ANDROID.sha256, - strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], + strip_prefix = "rules_android-%s" % versions.version.version, + urls = [url.format(version = versions.ANDROID.version) for url in versions.ANDROID.url_templates], ) http_archive( diff --git a/examples/deps/WORKSPACE b/examples/deps/WORKSPACE index 21331bc66..759fd84e6 100644 --- a/examples/deps/WORKSPACE +++ b/examples/deps/WORKSPACE @@ -58,8 +58,8 @@ maven_install( http_archive( name = "rules_android", sha256 = versions.ANDROID.sha256, - strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], + strip_prefix = "rules_android-%s" % versions.ANDROID.version, + urls = [url.format(version = versions.ANDROID.version) for url in versions.ANDROID.url_templates], ) load( diff --git a/examples/jetpack_compose/WORKSPACE b/examples/jetpack_compose/WORKSPACE index ae4ff22f1..78814db0c 100644 --- a/examples/jetpack_compose/WORKSPACE +++ b/examples/jetpack_compose/WORKSPACE @@ -71,8 +71,8 @@ http_archive( http_archive( name = "rules_android", sha256 = versions.ANDROID.sha256, - strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], + strip_prefix = "rules_android-%s" % versions.ANDROID.version, + urls = [url.format(version = versions.ANDROID.version) for url in versions.ANDROID.url_templates], ) load("@rules_android//android:rules.bzl", "android_sdk_repository") diff --git a/examples/plugin/.bazelrc b/examples/plugin/.bazelrc new file mode 100644 index 000000000..b2aca4432 --- /dev/null +++ b/examples/plugin/.bazelrc @@ -0,0 +1 @@ +common --experimental_google_legacy_api \ No newline at end of file diff --git a/examples/trivial/.bazelrc b/examples/trivial/.bazelrc new file mode 100644 index 000000000..b2aca4432 --- /dev/null +++ b/examples/trivial/.bazelrc @@ -0,0 +1 @@ +common --experimental_google_legacy_api \ No newline at end of file diff --git a/src/main/starlark/core/repositories/download.bzl b/src/main/starlark/core/repositories/download.bzl index 909c0c635..f87fef62e 100644 --- a/src/main/starlark/core/repositories/download.bzl +++ b/src/main/starlark/core/repositories/download.bzl @@ -80,8 +80,8 @@ def kt_download_local_dev_dependencies(): rules_stardoc_repository( name = "rules_android", sha256 = versions.ANDROID.sha256, - strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], + strip_prefix = "rules_android-%s" % versions.ANDROID.version, + urls = [url.format(version = versions.ANDROID.version) for url in versions.ANDROID.url_templates], starlark_packages = [ "android", ], diff --git a/src/main/starlark/core/repositories/initialize.release.bzl b/src/main/starlark/core/repositories/initialize.release.bzl index 144a03b4a..22bedb53a 100644 --- a/src/main/starlark/core/repositories/initialize.release.bzl +++ b/src/main/starlark/core/repositories/initialize.release.bzl @@ -78,8 +78,8 @@ def kotlin_repositories( http_file, name = "rules_android", sha256 = versions.ANDROID.sha256, - strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, - urls = [url.format(version = versions.ANDROIDANDROID.version) for url in versions.ANDROID.url_templates], + strip_prefix = "rules_android-%s" % versions.ANDROID.version, + urls = [url.format(version = versions.ANDROID.version) for url in versions.ANDROID.url_templates], ) versions.use_repository( From e342eba78f64bb183200e74d3e64eeac65f54ca6 Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Fri, 9 Aug 2024 13:31:23 -0700 Subject: [PATCH 5/6] Fix --- src/main/starlark/core/repositories/versions.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl index e46f46b10..198a99ad7 100644 --- a/src/main/starlark/core/repositories/versions.bzl +++ b/src/main/starlark/core/repositories/versions.bzl @@ -77,7 +77,7 @@ versions = struct( ANDROID = version( version = "0.5.1", url_templates = [ - "https://github.com/bazelbuild/rules_android/releases/download/v{}/rules_android-v{}.tar.gz", + "https://github.com/bazelbuild/rules_android/releases/download/v{version}/rules_android-v{version}.tar.gz", ], sha256 = "ee0618755913ef7fd6511288a232e8fad24838b9af6ea73972a76e81053c8c2d", ), From 64d6ed771c4982ef60d9288aac7315281a3347b2 Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Wed, 11 Sep 2024 18:22:07 -0700 Subject: [PATCH 6/6] More --- MODULE.bazel | 1 - MODULE.release.bazel | 1 - examples/android/.bazelrc | 2 +- examples/plugin/.bazelrc | 2 +- examples/trivial/.bazelrc | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index d05613151..5f8e1095b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -9,7 +9,6 @@ bazel_dep(name = "platforms", version = "0.0.10") bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "rules_java", version = "7.2.0") bazel_dep(name = "rules_python", version = "0.23.1") -bazel_dep(name = "rules_cc", version = "0.0.9") bazel_dep(name = "rules_android", version = "0.5.1") rules_kotlin_extensions = use_extension("//src/main/starlark/core/repositories:bzlmod_setup.bzl", "rules_kotlin_extensions") diff --git a/MODULE.release.bazel b/MODULE.release.bazel index 1df129b64..18875cc9f 100644 --- a/MODULE.release.bazel +++ b/MODULE.release.bazel @@ -9,7 +9,6 @@ bazel_dep(name = "platforms", version = "0.0.10") bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "rules_java", version = "7.2.0") bazel_dep(name = "rules_python", version = "0.23.1") -bazel_dep(name = "rules_cc", version = "0.0.8") bazel_dep(name = "rules_android", version = "0.5.1") rules_kotlin_extensions = use_extension( diff --git a/examples/android/.bazelrc b/examples/android/.bazelrc index eab502035..3734ded09 100644 --- a/examples/android/.bazelrc +++ b/examples/android/.bazelrc @@ -1,3 +1,3 @@ common --lockfile_mode=off common --experimental_google_legacy_api -test --test_output=all \ No newline at end of file +test --test_output=all diff --git a/examples/plugin/.bazelrc b/examples/plugin/.bazelrc index b2aca4432..44a921772 100644 --- a/examples/plugin/.bazelrc +++ b/examples/plugin/.bazelrc @@ -1 +1 @@ -common --experimental_google_legacy_api \ No newline at end of file +common --experimental_google_legacy_api diff --git a/examples/trivial/.bazelrc b/examples/trivial/.bazelrc index b2aca4432..44a921772 100644 --- a/examples/trivial/.bazelrc +++ b/examples/trivial/.bazelrc @@ -1 +1 @@ -common --experimental_google_legacy_api \ No newline at end of file +common --experimental_google_legacy_api