[WIP][POC] Starlark implementation of kt_android_* rules

.bazelrc

@@ -2,3 +2,7 @@ build --strategy=KotlinCompile=worker
 build --test_output=all
 build --verbose_failures
 
+# Expose (not really) experimental Android providers need by rules_android-
+# AndroidLibraryResourceClassJarProvider, AndroidIdeInfo, ...
+build --experimental_google_legacy_api
+

examples/android/.bazelrc

@@ -0,0 +1,3 @@
+# Expose (not really) experimental Android providers need by rules_android-
+# AndroidLibraryResourceClassJarProvider, AndroidIdeInfo, ...
+build --experimental_google_legacy_api

examples/android/WORKSPACE

@@ -56,18 +56,26 @@ maven_install(
         "https://maven.google.com",
         "https://repo1.maven.org/maven2",
     ],
+    use_starlark_android_rules = True,
+    aar_import_bzl_label = "@io_bazel_rules_android//rules:rules.bzl",
 )
 
+# Pulling from personal branch since we need a few fixes in rules_android
+# A non complete list can be seen here https://github.com/bazelbuild/rules_android/pulls
 http_archive(
-    name = "build_bazel_rules_android",
+    name = "io_bazel_rules_android",
     sha256 = versions.ANDROID.SHA,
     strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION,
-    urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION],
+    urls = ["https://github.com/mauriciogg/rules_android/archive/refs/tags/pre-alpha-01-11-2022-3.zip"],
 )
 
-load(
-    "@build_bazel_rules_android//android:rules.bzl",
-    "android_sdk_repository",
+load("@io_bazel_rules_android//:defs.bzl", "rules_android_workspace")
+
+rules_android_workspace()
+
+register_toolchains(
+    "@io_bazel_rules_android//toolchains/android:android_default_toolchain",
+    "@io_bazel_rules_android//toolchains/android_sdk:android_sdk_tools",
 )
 
 android_sdk_repository(

examples/android/app/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
-load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
+load("@io_bazel_rules_android//rules:rules.bzl", "android_binary", "android_application")
 
 # An app that consumes android-kt deps
 android_binary(
@@ -16,6 +16,21 @@ android_binary(
     ],
 )
 
+android_application(
+    name = "application",
+    custom_package = "examples.android.app",
+    bundle_config_file = "bundleConfig.pb.json",
+    manifest = "src/main/AndroidManifest.xml",
+    manifest_values = {
+        "lib_name": "lib",
+        "applicationId": "examples.android.app",
+    },
+    multidex = "native",
+    deps = [
+        "//libKtAndroid:my_kt",
+    ],
+)
+
 # An app that consumes jvm-kt libs
 android_binary(
     name = "app2",

examples/android/app/bundleConfig.pb.json

@@ -0,0 +1,46 @@
+{
+  "optimizations": {
+    "uncompressNativeLibraries": { "enabled": false },
+    "standaloneConfig": {
+      "dexMergingStrategy": "NEVER_MERGE"
+    }
+  },
+  "compression": {
+    "uncompressedGlob": [
+      "**/*.3g2",
+      "**/*.3gp",
+      "**/*.3gpp",
+      "**/*.3gpp2",
+      "**/*.aac",
+      "**/*.amr",
+      "**/*.awb",
+      "**/*.gif",
+      "**/*.imy",
+      "**/*.jet",
+      "**/*.jpeg",
+      "**/*.jpg",
+      "**/*.m4a",
+      "**/*.m4v",
+      "**/*.mid",
+      "**/*.midi",
+      "**/*.mkv",
+      "**/*.mp2",
+      "**/*.mp3",
+      "**/*.mp4",
+      "**/*.mpeg",
+      "**/*.mpg",
+      "**/*.ogg",
+      "**/*.png",
+      "**/*.rtttl",
+      "**/*.smf",
+      "**/*.so.xz",
+      "**/*.so.zst",
+      "**/*.wav",
+      "**/*.webm",
+      "**/*.wma",
+      "**/*.wmv",
+      "**/*.xmf",
+      "**/*.zst.so"
+    ]
+  }
+}

examples/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="1"
     package="examples.android.app">
   <uses-sdk
       android:minSdkVersion="23"
@@ -21,4 +22,4 @@
     </activity>
   </application>
 
-</manifest>
+</manifest>

examples/android/libAndroid/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("@io_bazel_rules_android//rules:rules.bzl", "android_library")
 load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 
 android_library(

examples/android/libKtAndroid/BUILD.bazel

@@ -32,16 +32,20 @@ kt_android_library(
     tags = ["trace"],
     visibility = ["//visibility:public"],
     deps = [
-        ":res2",
         "@maven//:androidx_appcompat_appcompat",
         "@maven//:com_google_auto_value_auto_value_annotations",
         "@maven//:org_jetbrains_kotlinx_kotlinx_serialization_runtime",
     ],
 )
 
-android_library(
-    name = "res2",
-    custom_package = "examples.android.lib",
-    manifest = "src/main/AndroidManifest.xml",
-    resource_files = glob(["res2/**"]),
-)
+# Commenting out- rules_android resource processing wil produce
+# two resource classes with the same package and upstream targets
+# that depend on res and res2 will only see definitions from
+# the jar that appears firs in the classpaht resulting in
+# field not found exceptions.
+#android_library(
+#    name = "res2",
+#    custom_package = "examples.android.lib",
+#    manifest = "src/main/AndroidManifest.xml",
+#    resource_files = glob(["res2/**"]),
+#)

examples/android/libKtAndroid/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
   <string name="where_you_at">Where you at?</string>
+  <string name="hello">hello?</string>
 </resources>

examples/android/libKtAndroid/src/test/java/examples/android/lib/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_local_test")
 kt_android_local_test(
     name = "SomeTest",
     srcs = ["SomeTest.kt"],
-    associates = ["//libKtAndroid:my_kt_kt"],
+    associates = ["//libKtAndroid:my_kt"],
     custom_package = "examples.android.lib",
     manifest = "AndroidManifest.xml",
     deps = [

examples/anvil/.bazelrc

@@ -0,0 +1,3 @@
+# Expose (not really) experimental Android providers need by rules_android-
+# AndroidLibraryResourceClassJarProvider, AndroidIdeInfo, ...
+common --experimental_google_legacy_api

examples/anvil/WORKSPACE

@@ -17,23 +17,6 @@ register_toolchains("//:kotlin_toolchain")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-http_archive(
-    name = "build_bazel_rules_android",
-    sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
-    strip_prefix = "rules_android-0.1.1",
-    urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"],
-)
-
-load(
-    "@build_bazel_rules_android//android:rules.bzl",
-    "android_sdk_repository",
-)
-
-android_sdk_repository(
-    name = "androidsdk",
-    build_tools_version = versions.ANDROID.BUILD_TOOLS,
-)
-
 # Skylib, for build_test, so don't bother initializing the unit test infrastructure.
 http_archive(
     name = "bazel_skylib",
@@ -115,4 +98,26 @@ maven_install(
         "https://maven.google.com",
         "https://repo1.maven.org/maven2",
     ],
+    use_starlark_android_rules = True,
+    aar_import_bzl_label = "@io_bazel_rules_android//rules:rules.bzl",
+)
+
+http_archive(
+    name = "io_bazel_rules_android",
+    sha256 = versions.ANDROID.SHA,
+    strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION,
+    urls = ["https://github.com/mauriciogg/rules_android/archive/refs/tags/pre-alpha-01-11-2022-3.zip"],
+)
+
+load("@io_bazel_rules_android//:defs.bzl", "rules_android_workspace")
+
+rules_android_workspace()
+
+register_toolchains(
+    "@io_bazel_rules_android//toolchains/android:android_default_toolchain",
+    "@io_bazel_rules_android//toolchains/android_sdk:android_sdk_tools",
+)
+android_sdk_repository(
+    name = "androidsdk",
+    build_tools_version = versions.ANDROID.BUILD_TOOLS,
 )

examples/anvil/app/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
+load("@io_bazel_rules_android//rules:rules.bzl", "android_binary")
 
 android_binary(
     name = "app",

examples/associates/.bazelrc

@@ -0,0 +1 @@
+common --experimental_google_legacy_api

examples/associates/WORKSPACE

@@ -19,13 +19,6 @@ kt_register_toolchains()
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-http_archive(
-    name = "build_bazel_rules_android",
-    sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
-    strip_prefix = "rules_android-0.1.1",
-    urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"],
-)
-
 http_archive(
     name = "bazel_skylib",
     sha256 = versions.SKYLIB_SHA,
@@ -53,6 +46,22 @@ maven_install(
     ],
 )
 
+http_archive(
+    name = "io_bazel_rules_android",
+    sha256 = versions.ANDROID.SHA,
+    strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION,
+    urls = ["https://github.com/mauriciogg/rules_android/archive/refs/tags/pre-alpha-01-11-2022-3.zip"],
+)
+
+load("@io_bazel_rules_android//:defs.bzl", "rules_android_workspace")
+
+rules_android_workspace()
+
+register_toolchains(
+    "@io_bazel_rules_android//toolchains/android:android_default_toolchain",
+    "@io_bazel_rules_android//toolchains/android_sdk:android_sdk_tools",
+)
+
 http_archive(
     name = "rules_pkg",
     sha256 = "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a",

examples/jetpack_compose/.bazelrc

@@ -5,3 +5,8 @@ build --define=android_dexmerger_tool=d8_dexmerger
 build --define=android_incremental_dexing_tool=d8_dexbuilder
 build --define=android_standalone_dexing_tool=d8_compat_dx
 build --nouse_workers_with_dexbuilder
+
+# Expose (not really) experimental Android providers need by rules_android-
+# AndroidLibraryResourceClassJarProvider, AndroidIdeInfo, ...
+common --experimental_google_legacy_api
+

examples/jetpack_compose/BUILD

@@ -33,11 +33,16 @@ kt_compiler_plugin(
 # Used in 'override_targets' by referencing @//:kotlinx_coroutines_core_jvm
 kt_jvm_import(
     name = "kotlinx_coroutines_core_jvm",
-    jars = ["@maven_secondary//:v1/https/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.3/kotlinx-coroutines-core-jvm-1.6.3.jar"],
-    srcjar = "@maven_secondary//:v1/https/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.3/kotlinx-coroutines-core-jvm-1.6.3-sources.jar",
+    jars = [":kotlinx_coroutines_core_jvm_jar"],
     visibility = ["//visibility:public"],
     deps = [
         "//stub:sun_misc",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
     ],
 )
+
+# HACK: for some reason the underlying jar is not visible when using starlark rules
+filegroup(
+    name = "kotlinx_coroutines_core_jvm_jar",
+    srcs =  ["@maven_secondary//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_6_3"],
+)

examples/jetpack_compose/WORKSPACE

@@ -1,4 +1,5 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 _COMPOSE_VERSION = "1.2.1"
 
@@ -62,6 +63,8 @@ maven_install(
         "https://maven.google.com",
         "https://repo1.maven.org/maven2",
     ],
+    use_starlark_android_rules = True,
+    aar_import_bzl_label = "@io_bazel_rules_android//rules:rules.bzl",
 )
 
 # Secondary maven repository used mainly for workarounds
@@ -74,6 +77,8 @@ maven_install(
     ],
     fetch_sources = True,
     repositories = ["https://repo1.maven.org/maven2"],
+    use_starlark_android_rules = True,
+    aar_import_bzl_label = "@io_bazel_rules_android//rules:rules.bzl",
 )
 
 http_archive(
@@ -88,13 +93,20 @@ http_archive(
 ## Android
 
 http_archive(
-    name = "build_bazel_rules_android",
+    name = "io_bazel_rules_android",
     sha256 = versions.ANDROID.SHA,
     strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION,
-    urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION],
+    urls = ["https://github.com/mauriciogg/rules_android/archive/refs/tags/pre-alpha-01-11-2022-3.zip"],
 )
 
-load("@build_bazel_rules_android//android:rules.bzl", "android_sdk_repository")
+load("@io_bazel_rules_android//:defs.bzl", "rules_android_workspace")
+
+rules_android_workspace()
+
+register_toolchains(
+    "@io_bazel_rules_android//toolchains/android:android_default_toolchain",
+    "@io_bazel_rules_android//toolchains/android_sdk:android_sdk_tools",
+)
 
 android_sdk_repository(
     name = "androidsdk",

examples/jetpack_compose/app/AndroidManifest.xml

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
           package="cm.ben.android.bazel.compose.example">
 
     <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="29" />
-</manifest>
+    <application>
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+    </application>
+</manifest>

examples/jetpack_compose/app/BUILD

@@ -1,5 +1,5 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
-load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
+load("@io_bazel_rules_android//rules:rules.bzl", "android_binary")
 
 # An app that consumes android-kt deps
 android_binary(

examples/plugin/.bazelrc

@@ -0,0 +1,3 @@
+# Expose (not really) experimental Android providers need by rules_android-
+# AndroidLibraryResourceClassJarProvider, AndroidIdeInfo, ...
+common --experimental_google_legacy_api