[maintenance] Update rules_android (#1443)

agluszak · web-flow · commit b41227548970 · 2026-01-13T17:43:12.000-08:00
* [maintenance] Update rules_android * Use macos_arm64 * Fix examples * Fix * remove rules_cc from WORKSPACE * Revert "remove rules_cc from WORKSPACE" This reverts commit d5a3e48.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -29,7 +29,7 @@
     ANDROID_NDK_HOME: /opt/android-ndk-r25b
 
 .macos: &macos
-  platform: macos
+  platform: macos_arm64
   environment:
     ANDROID_NDK_HOME: /Users/buildkite/android-ndk-r25b
 
diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
@@ -1,5 +1,5 @@
 matrix:
-  platform: ["macos", "ubuntu2004"]
+  platform: ["macos_arm64", "ubuntu2004"]
   bazel: ["7.x", "8.x"]
 tasks:
   verify_targets:
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -19,7 +19,7 @@ bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
 bazel_dep(name = "rules_java", version = "8.9.0")
 bazel_dep(name = "rules_python", version = "0.23.1")
-bazel_dep(name = "rules_android", version = "0.6.6")
+bazel_dep(name = "rules_android", version = "0.7.0")
 
 remote_android_extensions = use_extension(
     "@rules_android//bzlmod_extensions:android_extensions.bzl",
@@ -32,7 +32,7 @@ use_repo(android_sdk_repository_extension, "androidsdk")
 
 register_toolchains("@androidsdk//:all")
 
-bazel_dep(name = "bazel_features", version = "1.25.0")
+bazel_dep(name = "bazel_features", version = "1.30.0")
 bazel_dep(name = "rules_shell", version = "0.4.1")
 bazel_dep(name = "bazel_worker_api", version = "0.0.8")
 bazel_dep(name = "bazel_worker_java", version = "0.0.8")
@@ -141,11 +141,9 @@ bazel_dep(name = "rules_bazel_integration_test", version = "0.34.0", dev_depende
 
 bazel_binaries = use_extension("@rules_bazel_integration_test//:extensions.bzl", "bazel_binaries", dev_dependency = True)
 bazel_binaries.download(version_file = "//:.bazelversion")
-bazel_binaries.download(version = "8.2.1")
 use_repo(
     bazel_binaries,
     "bazel_binaries",
     "bazel_binaries_bazelisk",
     "build_bazel_bazel_.bazelversion",
-    "build_bazel_bazel_8_2_1",
 )
diff --git a/MODULE.release.bazel b/MODULE.release.bazel
@@ -8,8 +8,8 @@ module(
 bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_java", version = "8.9.0")
-bazel_dep(name = "rules_android", version = "0.6.4")
-bazel_dep(name = "bazel_features", version = "1.25.0")
+bazel_dep(name = "rules_android", version = "0.7.0")
+bazel_dep(name = "bazel_features", version = "1.30.0")
 bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
 bazel_dep(name = "rules_proto", version = "6.0.2", repo_name = "rules_proto")
 bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "py_absl")
diff --git a/examples/android/.bazelrc b/examples/android/.bazelrc
@@ -1,3 +1,5 @@
+common --java_runtime_version=remotejdk_21
+common --tool_java_runtime_version=remotejdk_21
 common --lockfile_mode=off
 test --test_output=all
 build --config=android_worker
diff --git a/examples/android/MODULE.bazel b/examples/android/MODULE.bazel
@@ -1,6 +1,6 @@
 module(name = "android-example")
 
-bazel_dep(name = "rules_android", version = "0.6.6")
+bazel_dep(name = "rules_android", version = "0.7.0")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
 bazel_dep(name = "rules_java", version = "8.9.0")
diff --git a/examples/android/WORKSPACE b/examples/android/WORKSPACE
@@ -37,6 +37,36 @@ http_archive(
     urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
 )
 
+http_archive(
+    name = "bazel_features",
+    sha256 = versions.BAZEL_FEATURES.sha256,
+    strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
+    urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+http_archive(
+    name = "rules_cc",
+    sha256 = versions.RULES_CC.sha256,
+    strip_prefix = versions.RULES_CC.strip_prefix_template.format(version = versions.RULES_CC.version),
+    urls = [url.format(version = versions.RULES_CC.version) for url in versions.RULES_CC.url_templates],
+)
+
+load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
+
+rules_cc_dependencies()
+
+rules_cc_toolchains()
+
+http_archive(
+    name = "rules_java",
+    sha256 = versions.RULES_JAVA.sha256,
+    urls = [url.format(version = versions.RULES_JAVA.version) for url in versions.RULES_JAVA.url_templates],
+)
+
 # Android rules dependencies
 load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
 
diff --git a/examples/anvil/.bazelrc b/examples/anvil/.bazelrc
@@ -0,0 +1,2 @@
+common --java_runtime_version=remotejdk_21
+common --tool_java_runtime_version=remotejdk_21
diff --git a/examples/anvil/WORKSPACE b/examples/anvil/WORKSPACE
@@ -28,6 +28,36 @@ http_archive(
     urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
 )
 
+http_archive(
+    name = "bazel_features",
+    sha256 = versions.BAZEL_FEATURES.sha256,
+    strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
+    urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+http_archive(
+    name = "rules_cc",
+    sha256 = versions.RULES_CC.sha256,
+    strip_prefix = versions.RULES_CC.strip_prefix_template.format(version = versions.RULES_CC.version),
+    urls = [url.format(version = versions.RULES_CC.version) for url in versions.RULES_CC.url_templates],
+)
+
+load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
+
+rules_cc_dependencies()
+
+rules_cc_toolchains()
+
+http_archive(
+    name = "rules_java",
+    sha256 = versions.RULES_JAVA.sha256,
+    urls = [url.format(version = versions.RULES_JAVA.version) for url in versions.RULES_JAVA.url_templates],
+)
+
 # Android rules dependencies
 load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
 
diff --git a/examples/associates/.bazelrc b/examples/associates/.bazelrc
@@ -0,0 +1,2 @@
+common --java_runtime_version=remotejdk_21
+common --tool_java_runtime_version=remotejdk_21
diff --git a/examples/associates/WORKSPACE b/examples/associates/WORKSPACE
@@ -28,6 +28,36 @@ http_archive(
     urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
 )
 
+http_archive(
+    name = "bazel_features",
+    sha256 = versions.BAZEL_FEATURES.sha256,
+    strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
+    urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+http_archive(
+    name = "rules_cc",
+    sha256 = versions.RULES_CC.sha256,
+    strip_prefix = versions.RULES_CC.strip_prefix_template.format(version = versions.RULES_CC.version),
+    urls = [url.format(version = versions.RULES_CC.version) for url in versions.RULES_CC.url_templates],
+)
+
+load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
+
+rules_cc_dependencies()
+
+rules_cc_toolchains()
+
+http_archive(
+    name = "rules_java",
+    sha256 = versions.RULES_JAVA.sha256,
+    urls = [url.format(version = versions.RULES_JAVA.version) for url in versions.RULES_JAVA.url_templates],
+)
+
 kotlin_repositories()
 
 ##### rules_java setup for rules_android #####
diff --git a/examples/dagger/.bazelrc b/examples/dagger/.bazelrc
@@ -0,0 +1,2 @@
+common --java_runtime_version=remotejdk_21
+common --tool_java_runtime_version=remotejdk_21
diff --git a/examples/dagger/WORKSPACE b/examples/dagger/WORKSPACE
@@ -28,6 +28,36 @@ http_archive(
     urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
 )
 
+http_archive(
+    name = "bazel_features",
+    sha256 = versions.BAZEL_FEATURES.sha256,
+    strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
+    urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+http_archive(
+    name = "rules_cc",
+    sha256 = versions.RULES_CC.sha256,
+    strip_prefix = versions.RULES_CC.strip_prefix_template.format(version = versions.RULES_CC.version),
+    urls = [url.format(version = versions.RULES_CC.version) for url in versions.RULES_CC.url_templates],
+)
+
+load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
+
+rules_cc_dependencies()
+
+rules_cc_toolchains()
+
+http_archive(
+    name = "rules_java",
+    sha256 = versions.RULES_JAVA.sha256,
+    urls = [url.format(version = versions.RULES_JAVA.version) for url in versions.RULES_JAVA.url_templates],
+)
+
 kotlin_repositories()
 
 ##### rules_java setup for rules_android #####
diff --git a/examples/deps/.bazelrc b/examples/deps/.bazelrc
@@ -1,3 +1,5 @@
+common --java_runtime_version=remotejdk_21
+common --tool_java_runtime_version=remotejdk_21
 common --incompatible_enable_android_toolchain_resolution
 common --enable_workspace=true
 common --enable_bzlmod=false
diff --git a/examples/deps/WORKSPACE b/examples/deps/WORKSPACE
@@ -28,6 +28,36 @@ http_archive(
     urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
 )
 
+http_archive(
+    name = "bazel_features",
+    sha256 = versions.BAZEL_FEATURES.sha256,
+    strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
+    urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+http_archive(
+    name = "rules_cc",
+    sha256 = versions.RULES_CC.sha256,
+    strip_prefix = versions.RULES_CC.strip_prefix_template.format(version = versions.RULES_CC.version),
+    urls = [url.format(version = versions.RULES_CC.version) for url in versions.RULES_CC.url_templates],
+)
+
+load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
+
+rules_cc_dependencies()
+
+rules_cc_toolchains()
+
+http_archive(
+    name = "rules_java",
+    sha256 = versions.RULES_JAVA.sha256,
+    urls = [url.format(version = versions.RULES_JAVA.version) for url in versions.RULES_JAVA.url_templates],
+)
+
 # Android rules dependencies
 load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
 
diff --git a/examples/jetpack_compose/MODULE.bazel b/examples/jetpack_compose/MODULE.bazel
@@ -11,7 +11,7 @@ local_path_override(
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_jvm_external", version = "6.7")
 bazel_dep(name = "rules_shell", version = "0.4.1")
-bazel_dep(name = "rules_android", version = "0.6.6")
+bazel_dep(name = "rules_android", version = "0.7.0")
 
 register_toolchains(
     "@rules_android//toolchains/android:android_default_toolchain",
diff --git a/examples/ksp/.bazelrc b/examples/ksp/.bazelrc
@@ -0,0 +1,2 @@
+common --java_runtime_version=remotejdk_21
+common --tool_java_runtime_version=remotejdk_21
diff --git a/examples/multiplex/.bazelrc b/examples/multiplex/.bazelrc
@@ -1,3 +1,5 @@
+common --java_runtime_version=remotejdk_21
+common --tool_java_runtime_version=remotejdk_21
 build --worker_verbose
 build --worker_max_instances=1
 build --worker_quit_after_build
diff --git a/examples/multiplex/MODULE.bazel b/examples/multiplex/MODULE.bazel
@@ -3,7 +3,7 @@ module(name = "multiplex-example")
 bazel_dep(name = "rules_java", version = "8.9.0")
 bazel_dep(name = "rules_kotlin", version = "1.9.5")
 bazel_dep(name = "rules_jvm_external", version = "6.6")
-bazel_dep(name = "bazel_features", version = "1.25.0")
+bazel_dep(name = "bazel_features", version = "1.30.0")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
diff --git a/examples/multiplex/WORKSPACE b/examples/multiplex/WORKSPACE
@@ -32,6 +32,25 @@ load("@bazel_features//:deps.bzl", "bazel_features_deps")
 
 bazel_features_deps()
 
+http_archive(
+    name = "rules_cc",
+    sha256 = versions.RULES_CC.sha256,
+    strip_prefix = versions.RULES_CC.strip_prefix_template.format(version = versions.RULES_CC.version),
+    urls = [url.format(version = versions.RULES_CC.version) for url in versions.RULES_CC.url_templates],
+)
+
+load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
+
+rules_cc_dependencies()
+
+rules_cc_toolchains()
+
+http_archive(
+    name = "rules_java",
+    sha256 = versions.RULES_JAVA.sha256,
+    urls = [url.format(version = versions.RULES_JAVA.version) for url in versions.RULES_JAVA.url_templates],
+)
+
 kotlin_repositories()
 
 ##### rules_java setup for rules_android #####
diff --git a/examples/plugin/.bazelrc b/examples/plugin/.bazelrc
@@ -0,0 +1,2 @@
+common --java_runtime_version=remotejdk_21
+common --tool_java_runtime_version=remotejdk_21
diff --git a/examples/plugin/WORKSPACE b/examples/plugin/WORKSPACE
@@ -28,6 +28,36 @@ http_archive(
     urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
 )
 
+http_archive(
+    name = "bazel_features",
+    sha256 = versions.BAZEL_FEATURES.sha256,
+    strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
+    urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+http_archive(
+    name = "rules_cc",
+    sha256 = versions.RULES_CC.sha256,
+    strip_prefix = versions.RULES_CC.strip_prefix_template.format(version = versions.RULES_CC.version),
+    urls = [url.format(version = versions.RULES_CC.version) for url in versions.RULES_CC.url_templates],
+)
+
+load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
+
+rules_cc_dependencies()
+
+rules_cc_toolchains()
+
+http_archive(
+    name = "rules_java",
+    sha256 = versions.RULES_JAVA.sha256,
+    urls = [url.format(version = versions.RULES_JAVA.version) for url in versions.RULES_JAVA.url_templates],
+)
+
 # Android rules dependencies
 load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
 
diff --git a/examples/trivial/.bazelrc b/examples/trivial/.bazelrc
@@ -1 +1,3 @@
+common --java_runtime_version=remotejdk_21
+common --tool_java_runtime_version=remotejdk_21
 test --test_output=streamed
diff --git a/examples/trivial/WORKSPACE b/examples/trivial/WORKSPACE
diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+common --java_runtime_version=remotejdk_21`
	`2`	`+common --tool_java_runtime_version=remotejdk_21`
`1`	`3`	`common --lockfile_mode=off`
`2`	`4`	`test --test_output=all`
`3`	`5`	`build --config=android_worker`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+common --java_runtime_version=remotejdk_21`
	`2`	`+common --tool_java_runtime_version=remotejdk_21`