Update rules_android to fix --incompatible_disable_native_repo_rules failure (#1358)

* Update rules_android to fix --incompatible_disable_native_repo_rules failure

This will pull in bazelbuild/rules_android#376 and fix [release failures](https://buildkite.com/bazel/bcr-presubmit/builds/18423/steps/canvas?sid=0198cdb5-4b4a-459a-9762-9bcb94947930)

* Add load for android_sdk_repository

* switch to module support for android_sdk_repository, fix kapt test for dealing with transitions

* Disable autoloads

* Use sdk and ndk rules in module.bzl

* Set ndk to 25b for android_ndk_repository compatibility

* fix local repository

* Move deprecating flags to bzlmod only

* update example rules_android version

* Deal with dependency uses of incompatible_disable_native_repo_rules

* Remove http_jar

* remove rbe tag (rbe status is now derived from the task name)

* Comment out unsupported commands, update flags to be more orderly.

* Fix bzlmod, bump versions

* Always pass workspace flags

* update docs

* Ubuntu has character issues

* emdash.

* ignore whitespace

Author: restingbull

.bazelci/presubmit.yml

@@ -1,45 +1,65 @@
 ---
+# Common task configurations.
+.unittests: &unittests
+  build_flags: ${{ test_flags }}
+  test_flags: ${{ test_flags }}
+  test_targets:
+    - "//src/..."
+  build_targets:
+    - "//src/..."
+
+.integration_tests: &integration_tests
+  name: "Integration Tests"
+  platform: ${{ platform.name }}
+  environment:
+    ANDROID_NDK_HOME: ${{ platform.android_ndk_home }}
+  test_flags: ${{ integration_shard_flags }}
+  test_targets:
+    - //examples:all
+
+# Common platform configurations.
+.ubuntu2404: &ubuntu2404
+  platform: ubuntu2404
+  environment:
+    ANDROID_NDK_HOME: /opt/android-ndk-r25b
+
+.ubuntu2204: &ubuntu2204
+  platform: ubuntu2204
+  environment:
+    ANDROID_NDK_HOME: /opt/android-ndk-r25b
+
+.macos: &macos
+  platform: macos
+  environment:
+    ANDROID_NDK_HOME: /Users/buildkite/android-ndk-r25b
+
+# bazelci pipeline
 matrix:
-  unittest_platform:
-    - ubuntu2404
-    - ubuntu2204
-  integration_platform:
-    - ubuntu2404
-    - ubuntu2204
   integration_shard_flags:
     - ["--test_tag_filters=shard_0"]
     - ["--test_tag_filters=shard_1"]
     - ["--test_tag_filters=shard_2"]
-    # - macos
-    # - windows re-enable when rules_bazel_integration_test can support custom test runner on windows.
   test_flags:
-    - []
+    - ["--enable_bzlmod=true"]
 validate_config: 1
-bazel: 8.4.2
+bazel: 7.6.1
 buildifier:
   version: 8.2.0
   # no lint warnings for the moment. They are basically a smoke alarm in hell.
   # keep this argument in sync with .pre-commit-config.yaml
   warnings: "+unsorted-dict-items,-confusing-name,-constant-glob,-duplicated-name,-function-docstring,-function-docstring-args,-function-docstring-header,-module-docstring,-name-conventions,-no-effect,-constant-glob,-provider-params,-print,-rule-impl-return,-bzl-visibility,-unnamed-macro,-uninitialized,-unreachable"
 tasks:
-  unittests:
-    name: "Unit Tests"
-    platform: ${{ unittest_platform }}
-    build_flags: ${{ test_flags }}
-    test_flags: ${{ test_flags }}
-    test_targets:
-      - "//src/..."
-    build_targets:
-      - "//src/..."
-  integration_tests:
-    name: "Integration Tests"
-    platform: ${{ integration_platform }}
-    test_flags: ${{ integration_shard_flags }}
-    test_targets:
-      - //examples:all
-    environment:
-      ANDROID_NDK_HOME: /opt/android-ndk-r25b
-  rbe_ubuntu2404:
+  macos_unittests:
+    <<: [ *macos, *unittests ]
+  ubuntu2404_unittests:
+    <<: [*ubuntu2404, *unittests]
+  ubuntu2404_integration_tests:
+    <<: [*ubuntu2404, *integration_tests]
+  ubuntu2204_unittests:
+    <<: [*ubuntu2204, *unittests]
+  ubuntu2204_integration_tests:
+    <<: [*ubuntu2204, *integration_tests]
+  rbe_ubuntu1604:
     test_targets:
       - "--"
       - "//src/test/kotlin/io/bazel/kotlin/builder:builder_tests"
@@ -48,21 +68,17 @@ tasks:
       - "//src/test/kotlin/io/bazel/kotlin:KotlinJvmAssociatesBasicVisibilityTest"
       - "//src/test/kotlin/io/bazel/kotlin:KotlinJvmBasicAssertionTest"
     test_flags:
-      # Override the default worker strategy for remote builds (worker strategy
-      # cannot be used with remote builds)
       - "--strategy=KotlinCompile=remote"
   stardoc:
     name: Stardoc api documentation
-    platform: ubuntu2404
-    build_flags:
-      - "--enable_bzlmod=true"
+    platform: rbe_ubuntu1604
     build_targets:
       - //kotlin:stardoc
     test_targets:
       - //docs:are_docs_up_to_date_test
   ktlint:
     name: KtLint
-    platform: ubuntu2404
+    <<: *ubuntu2404
     test_targets:
       - //...
     test_flags:

.bazelrc

@@ -1,10 +1,13 @@
 common --enable_bzlmod=true
 common --incompatible_use_plus_in_repo_names
 common --incompatible_disallow_empty_glob=false
-
 common --java_runtime_version=remotejdk_17
 common --tool_java_runtime_version=remotejdk_17
 
+# TODO[https://github.com/bazelbuild/rules_kotlin/issues/1395]: Uncomment when all rules support not using native repo rules.
+# common --incompatible_disable_native_repo_rules=true
+# common --incompatible_autoload_externally=
+
 build --strategy=KotlinCompile=worker
 build --test_output=all
 build --verbose_failures

BUILD

@@ -60,9 +60,6 @@ test_suite(
 # Release target.
 release_archive(
     name = "rules_kotlin_release",
-    srcs = [
-        "WORKSPACE.bzlmod",
-    ],
     src_map = {
         "BUILD.release.bazel": "BUILD.bazel",
         "MODULE.release.bazel": "MODULE.bazel",
@@ -85,6 +82,7 @@ filegroup(
     visibility = ["//:__subpackages__"],
 )
 
+# TODO[https://github.com/bazelbuild/rules_kotlin/issues/1395]: Must be run with `--config=deprecated`
 buildifier(
     name = "buildifier.check",
     exclude_patterns = [

MODULE.bazel

@@ -1,6 +1,6 @@
 module(
     name = "rules_kotlin",
-    version = "1.8.1",
+    version = "2.2.0",
     compatibility_level = 1,
     repo_name = "rules_kotlin",
 )
@@ -19,11 +19,24 @@ 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.4")
+bazel_dep(name = "rules_android", version = "0.6.6")
+
+remote_android_extensions = use_extension(
+    "@rules_android//bzlmod_extensions:android_extensions.bzl",
+    "remote_android_tools_extensions",
+)
+use_repo(remote_android_extensions, "android_tools")
+
+android_sdk_repository_extension = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension")
+use_repo(android_sdk_repository_extension, "androidsdk")
+
+register_toolchains("@androidsdk//:all")
+
 bazel_dep(name = "bazel_features", version = "1.25.0")
 bazel_dep(name = "rules_shell", version = "0.4.1")
 
-bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2", dev_dependency = True)
+# TODO[https://github.com/bazelbuild/rules_kotlin/issues/1395]: Update when fixed version is available.
+bazel_dep(name = "buildifier_prebuilt", version = "8.2.1", dev_dependency = True)
 
 rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
 use_repo(rules_java_toolchains, "remote_java_tools")

WORKSPACE.bzlmod

@@ -10,4 +10,4 @@ new="$2"
 [[ -f $new ]] || fail "missing new docs"
 [[ -f $current ]] || fail "missing current docs"
 
-diff -u "$1" "$2" || fail "kotlin docs are out of date"
+diff -wu "$1" "$2" || fail "kotlin docs are out of date"

docs/are_docs_up_to_date_test.sh

@@ -420,7 +420,7 @@ Define kotlin compiler options.
 | <a id="kt_kotlinc_options-x_enable_incremental_compilation"></a>x_enable_incremental_compilation |  Enable incremental compilation   | Boolean | optional |  `False`  |
 | <a id="kt_kotlinc_options-x_explicit_api_mode"></a>x_explicit_api_mode |  Enable explicit API mode for Kotlin libraries.   | String | optional |  `"off"`  |
 | <a id="kt_kotlinc_options-x_inline_classes"></a>x_inline_classes |  Enable experimental inline classes   | Boolean | optional |  `False`  |
-| <a id="kt_kotlinc_options-x_jdk_release"></a>x_jdk_release |  Compile against the specified JDK API version, similarly to javac's '-release'. This requires JDK 9 or newer. The supported versions depend on the JDK used; for JDK 17+, the supported versions are 1.8 and 9–21. This also sets the value of '-jvm-target' to be equal to the selected JDK version.   | String | optional |  `""`  |
+| <a id="kt_kotlinc_options-x_jdk_release"></a>x_jdk_release |  Compile against the specified JDK API version, similarly to javac's '-release'. This requires JDK 9 or newer. The supported versions depend on the JDK used; for JDK 17+, the supported versions are 1.8 and 9-21. This also sets the value of '-jvm-target' to be equal to the selected JDK version.   | String | optional |  `""`  |
 | <a id="kt_kotlinc_options-x_jspecify_annotations"></a>x_jspecify_annotations |  Controls how JSpecify annotations are treated. Options are 'default', 'ignore', 'warn', and 'strict'.   | String | optional |  `""`  |
 | <a id="kt_kotlinc_options-x_jsr_305"></a>x_jsr_305 |  Specifies how to handle JSR-305 annotations in Kotlin code. Options are 'default', 'ignore', 'warn', and 'strict'.   | String | optional |  `""`  |
 | <a id="kt_kotlinc_options-x_jvm_default"></a>x_jvm_default |  Specifies that a JVM default method should be generated for non-abstract Kotlin interface member.   | String | optional |  `"off"`  |
@@ -611,7 +611,7 @@ Call this in the WORKSPACE file to setup the Kotlin rules.
 <pre>
 load("@rules_kotlin//kotlin:repositories.doc.bzl", "versions")
 
-versions.use_repository(<a href="#versions.use_repository-name">name</a>, <a href="#versions.use_repository-version">version</a>, <a href="#versions.use_repository-rule">rule</a>, <a href="#versions.use_repository-kwargs">**kwargs</a>)
+versions.use_repository(<a href="#versions.use_repository-rule">rule</a>, <a href="#versions.use_repository-name">name</a>, <a href="#versions.use_repository-version">version</a>, <a href="#versions.use_repository-kwargs">kwargs</a>)
 </pre>
 
 
@@ -621,9 +621,9 @@ versions.use_repository(<a href="#versions.use_repository-name">name</a>, <a hre
 
 | Name  | Description | Default Value |
 | :------------- | :------------- | :------------- |
+| <a id="versions.use_repository-rule"></a>rule |  <p align="center"> - </p>   |  none |
 | <a id="versions.use_repository-name"></a>name |  <p align="center"> - </p>   |  none |
 | <a id="versions.use_repository-version"></a>version |  <p align="center"> - </p>   |  none |
-| <a id="versions.use_repository-rule"></a>rule |  <p align="center"> - </p>   |  none |
 | <a id="versions.use_repository-kwargs"></a>kwargs |  <p align="center"> - </p>   |  none |
 
 

docs/kotlin.md

@@ -1,6 +1,6 @@
 module(name = "android-example")
 
-bazel_dep(name = "rules_android", version = "0.6.4")
+bazel_dep(name = "rules_android", version = "0.6.6")
 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")
@@ -12,6 +12,13 @@ use_repo(android_sdk_repository_extension, "androidsdk")
 
 register_toolchains("@androidsdk//:sdk-toolchain", "@androidsdk//:all")
 
+bazel_dep(name = "rules_android_ndk", version = "0.1.2")
+
+android_ndk_repository_extension = use_extension("@rules_android_ndk//:extension.bzl", "android_ndk_repository_extension")
+use_repo(android_ndk_repository_extension, "androidndk")
+
+register_toolchains("@androidndk//:all")
+
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
     name = "maven_rules_kotlin_example",

examples/android/MODULE.bazel

@@ -1,3 +0,0 @@
-android_sdk_repository(name = "androidsdk")
-
-android_ndk_repository(name = "androidndk")

examples/android/WORKSPACE.bzlmod

@@ -1,7 +1,7 @@
 module(name = "trival-example")
 
 bazel_dep(name = "rules_java", version = "8.9.0")
-bazel_dep(name = "rules_kotlin", version = "1.9.5")
+bazel_dep(name = "rules_kotlin", version = "2.2.0")
 bazel_dep(name = "rules_jvm_external", version = "6.6")
 bazel_dep(name = "rules_shell", version = "0.4.0")