Import rules_android in MODULE.bazel (#1195)

bazelbuild · Jul 16, 2024 · 67be90d · 67be90d
1 parent d964c23
commit 67be90d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -10,6 +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")
 
 rules_kotlin_extensions = use_extension("//src/main/starlark/core/repositories:bzlmod_setup.bzl", "rules_kotlin_extensions")
 use_repo(
@@ -19,7 +20,6 @@ use_repo(
     "com_github_jetbrains_kotlin",
     "com_github_pinterest_ktlint",
     "released_rules_kotlin",
-    "rules_android",
 )
 
 # Once the released rules_koltin is defined, configure it.

diff --git a/MODULE.release.bazel b/MODULE.release.bazel
@@ -10,6 +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")
 
 rules_kotlin_extensions = use_extension(
     "//src/main/starlark/core/repositories:bzlmod_setup.bzl",
@@ -20,7 +21,6 @@ use_repo(
     "com_github_google_ksp",
     "com_github_jetbrains_kotlin",
     "com_github_pinterest_ktlint",
-    "rules_android",
 )
 
 register_toolchains("//kotlin/internal:default_toolchain")

diff --git a/src/main/starlark/core/repositories/initialize.release.bzl b/src/main/starlark/core/repositories/initialize.release.bzl
@@ -71,6 +71,9 @@ def kotlin_repositories(
         executable = True,
     )
 
+    if is_bzlmod:
+        return
+
     maybe(
         http_archive,
         name = "rules_android",
@@ -79,9 +82,6 @@ def kotlin_repositories(
         urls = versions.ANDROID.URLS,
     )
 
-    if is_bzlmod:
-        return
-
     versions.use_repository(
         name = "rules_python",
         rule = http_archive,