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

Author: restingbull

.bazelrc

@@ -2,7 +2,6 @@ common --enable_bzlmod=true
 common --incompatible_use_plus_in_repo_names
 common --incompatible_disallow_empty_glob=false
 common --incompatible_disable_native_repo_rules=true
-
 common:rbe --java_runtime_version=11
 common:rbe --tool_java_runtime_version=11
 

BUILD

@@ -58,9 +58,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",

MODULE.bazel

@@ -14,6 +14,18 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 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")
+
+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")
 

WORKSPACE.bzlmod

@@ -5,26 +5,49 @@ load("//kotlin/compiler:kapt.bzl", "kapt_compiler_plugin")
 load("//src/test/starlark:case.bzl", "Want", "suite")
 load("//src/test/starlark:truth.bzl", "flags_and_values_of")
 
+def _normalize_path_with_cfg(file):
+    """Attempts to normalize the file to standard configs.
+
+    This turns out to be necessary due to multiple transitions with testing.analysis_test.
+    """
+    prefix = file.path.removesuffix(file.short_path)
+    segments = prefix.split("/")
+    if segments[0] == "external":
+        return "(source) " + file.short_path
+    if segments[0] == "bazel-out":
+        # not exactly reliable, but the current test rules perform several transitions making it
+        # difficult to validate if a file is actually where it should be.
+        if "exec" in segments[1]:
+            return "(exec) " + file.short_path
+        return "(target) " + file.short_path
+
 def _action(env, got):
     got_target = env.expect.that_target(got)
 
-    inputs = []
+    want_inputs = {}
     for i in env.ctx.attr.exec_inputs:
         if JavaInfo in i:
             for jo in i[JavaInfo].java_outputs:
-                inputs.append(jo.compile_jar)
+                want_inputs[_normalize_path_with_cfg(jo.compile_jar)] = True
         else:
-            inputs.extend(i[DefaultInfo].files.to_list())
+            for f in i[DefaultInfo].files.to_list():
+                want_inputs[_normalize_path_with_cfg(f)] = True
     for i in env.ctx.attr.target_inputs:
         if JavaInfo in i:
             for jo in i[JavaInfo].java_outputs:
-                inputs.append(jo.compile_jar)
+                want_inputs[_normalize_path_with_cfg(jo.compile_jar)] = True
         else:
-            inputs.extend(i[DefaultInfo].files.to_list())
+            for f in i[DefaultInfo].files.to_list():
+                want_inputs[_normalize_path_with_cfg(f)] = True
 
     compile = got_target.action_named(env.ctx.attr.mnemonic)
 
-    compile.contains_at_least_inputs(inputs)
+    got_inputs = {
+        _normalize_path_with_cfg(f): True
+        for f in compile.actual.inputs.to_list()
+    }
+
+    env.expect.that_collection(got_inputs.keys()).contains_at_least(want_inputs.keys())
 
     got_target.runfiles().contains_at_least([
         "/".join((env.ctx.workspace_name, f.short_path))