Update rules_android to 0.5.1

Bencodes · Bencodes · commit 3d15d9969e47 · 2024-08-09T13:17:44.000-07:00
diff --git 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
@@ -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", "rules_kotlin_extensions")
 use_repo(
diff --git 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
@@ -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
@@ -66,9 +66,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
@@ -19,9 +19,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "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/examples/associates/WORKSPACE b/examples/associates/WORKSPACE
@@ -21,9 +21,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 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
@@ -61,9 +61,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
@@ -77,9 +77,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
@@ -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
@@ -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
@@ -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
@@ -72,10 +72,12 @@ versions = struct(
         ],
         sha256 = "ee0618755913ef7fd6511288a232e8fad24838b9af6ea73972a76e81053c8c2d",
     ),
-    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(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`common --enable_bzlmod=true`
	`2`	`+common --experimental_google_legacy_api`
`2`	`3`
`3`	`4`	`common:rbe --java_runtime_version=11`
`4`	`5`	`common:rbe --tool_java_runtime_version=11`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ load(`
`21`	`21`	`_kt_jvm_library = "kt_jvm_library",`
`22`	`22`	`)`
`23`	`23`
`24`		`-_ANDROID_SDK_JAR = "%s" % Label("//third_party:android_sdk")`
	`24`	`+_ANDROID_SDK_JAR = "%s" % Label("@rules_android//third_party:android_sdk")`
`25`	`25`
`26`	`26`	`def _kt_android_artifact(`
`27`	`27`	`name,`