Add support for Kotlin 2.1.20 (bazelbuild#1298)

* Add support for Kotlin 2.1.20

* Docs

* Fixes

* Fix maven_install file name for 2.1.20 version

* Get the compose example building again

Author: Bencodes

docs/kotlin.md

@@ -576,8 +576,8 @@ Call this in the WORKSPACE file to setup the Kotlin rules.
 | <a id="kotlin_repositories-is_bzlmod"></a>is_bzlmod |  <p align="center"> - </p>   |  `False` |
 | <a id="kotlin_repositories-compiler_repository_name"></a>compiler_repository_name |  for the kotlinc compiler repository.   |  `"com_github_jetbrains_kotlin"` |
 | <a id="kotlin_repositories-ksp_repository_name"></a>ksp_repository_name |  <p align="center"> - </p>   |  `"com_github_google_ksp"` |
-| <a id="kotlin_repositories-compiler_release"></a>compiler_release |  version provider from versions.bzl.   |  `struct(sha256 = "b6698d5728ad8f9edcdd01617d638073191d8a03139cc538a391b4e3759ad297", url_templates = ["https://github.com/JetBrains/kotlin/releases/download/v{version}/kotlin-compiler-{version}.zip"], version = "2.1.0")` |
-| <a id="kotlin_repositories-ksp_compiler_release"></a>ksp_compiler_release |  (internal) version provider from versions.bzl.   |  `struct(sha256 = "fc27b08cadc061a4a989af01cbeccb613feef1995f4aad68f2be0f886a3ee251", url_templates = ["https://github.com/google/ksp/releases/download/{version}/artifacts.zip"], version = "2.1.0-1.0.28")` |
+| <a id="kotlin_repositories-compiler_release"></a>compiler_release |  version provider from versions.bzl.   |  `struct(sha256 = "a118197b0de55ffab2bc8d5cd03a5e39033cfb53383d6931bc761dec0784891a", url_templates = ["https://github.com/JetBrains/kotlin/releases/download/v{version}/kotlin-compiler-{version}.zip"], version = "2.1.20")` |
+| <a id="kotlin_repositories-ksp_compiler_release"></a>ksp_compiler_release |  (internal) version provider from versions.bzl.   |  `struct(sha256 = "9f74659d447d3df29cabe0c8ee068810af313a584c1bbdde821f9894127f26e0", url_templates = ["https://github.com/google/ksp/releases/download/{version}/artifacts.zip"], version = "2.1.20-1.0.32")` |
 
 
 <a id="versions.use_repository"></a>

examples/dagger/WORKSPACE

@@ -40,11 +40,11 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
 
 maven_install(
     artifacts = [
-        "com.google.dagger:dagger:2.51.1",
-        "com.google.dagger:dagger-compiler:2.51.1",
-        "com.google.dagger:dagger-producers:2.51.1",
+        "com.google.dagger:dagger:2.56.2",
+        "com.google.dagger:dagger-compiler:2.56.2",
+        "com.google.dagger:dagger-producers:2.56.2",
         "javax.inject:javax.inject:1",
-        "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2",
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2",
     ],
     repositories = [
         "https://repo1.maven.org/maven2",

examples/jetpack_compose/WORKSPACE

@@ -8,44 +8,57 @@ http_archive(
     url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.5/rules_kotlin-v1.9.5.tar.gz",
 )
 
-load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version", "versions")
-
-KOTLINC_RELEASE = versions.KOTLIN_CURRENT_COMPILER_RELEASE
-
-kotlin_repositories(
-    compiler_release = kotlinc_version(
-        release = "2.0.0",
-        sha256 = "ef578730976154fd2c5968d75af8c2703b3de84a78dffe913f670326e149da3b",
-    ) if KOTLINC_RELEASE.version == "1.9.22" else kotlinc_version(
-        release = KOTLINC_RELEASE.version,
-        sha256 = KOTLINC_RELEASE.sha256,
-    ),
+load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "versions")
+
+http_archive(
+    name = "rules_jvm_external",
+    sha256 = versions.RULES_JVM_EXTERNAL.sha256,
+    strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL.version,
+    urls = [url.format(version = versions.RULES_JVM_EXTERNAL.version) for url in versions.RULES_JVM_EXTERNAL.url_templates],
 )
 
-register_toolchains("//:kotlin_toolchain")
+http_archive(
+    name = "rules_android",
+    sha256 = versions.RULES_ANDROID.sha256,
+    strip_prefix = versions.RULES_ANDROID.strip_prefix_template.format(version = versions.RULES_ANDROID.version),
+    urls = [url.format(version = versions.RULES_ANDROID.version) for url in versions.RULES_ANDROID.url_templates],
+)
 
-## JVM External
+http_archive(
+    name = "robolectric",
+    sha256 = "b2d2164bae80fcfbdd078eb2f0935ba06557402b8c814928d9e3bec7358e2b7b",
+    strip_prefix = "robolectric-bazel-4.14.1.2",
+    urls = ["https://github.com/robolectric/robolectric-bazel/releases/download/4.14.1.2/robolectric-bazel-4.14.1.2.tar.gz"],
+)
 
-versions.use_repository(
-    name = "io_bazel_stardoc",
-    rule = http_archive,
-    version = versions.IO_BAZEL_STARDOC,
+http_archive(
+    name = "bazel_skylib",
+    sha256 = versions.BAZEL_SKYLIB.sha256,
+    urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
 )
 
-RULES_JVM_EXTERNAL_TAG = "6.6"
+# Android rules dependencies
+load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
 
-RULES_JVM_EXTERNAL_SHA = "3afe5195069bd379373528899c03a3072f568d33bd96fe037bd43b1f590535e7"
+rules_android_prereqs()
 
-http_archive(
-    name = "rules_jvm_external",
-    sha256 = RULES_JVM_EXTERNAL_SHA,
-    strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
-        RULES_JVM_EXTERNAL_TAG,
-        RULES_JVM_EXTERNAL_TAG,
-    ),
-)
+##### rules_java setup for rules_android #####
+load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
+
+rules_java_dependencies()
+
+# note that the following line is what is minimally required from protobuf for the java rules
+# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
+load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")  # buildifier: disable=bzl-visibility
+
+proto_bazel_features(name = "proto_bazel_features")
+
+# register toolchains
+load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
+
+rules_java_toolchains()
 
+##### rules_jvm_external setup for rules_android #####
 load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
 
 rules_jvm_external_deps()
@@ -54,19 +67,34 @@ load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
 
 rules_jvm_external_setup()
 
-KOTLIN_TO_COMPOSE = {
-    "1.9.22": [
-        "org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:2.0.0",
-        "androidx.core:core-ktx:1.7.0",
-        "androidx.appcompat:appcompat:1.4.1",
-        "androidx.activity:activity-compose:1.3.0",
-        "androidx.compose.material:material:1.2.1",
-        "androidx.compose.ui:ui:1.2.1",
-        "androidx.compose.ui:ui-tooling:1.2.1",
-        "androidx.compose.runtime:runtime:1.2.1",
-    ],
-    "2.1.0": [
-        "org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:2.1.0",
+##### rules_android setup #####
+load("@rules_android//:defs.bzl", "rules_android_workspace")
+
+rules_android_workspace()
+
+# Android SDK setup
+load("@rules_android//rules:rules.bzl", "android_sdk_repository")
+
+android_sdk_repository(name = "androidsdk")
+
+register_toolchains(
+    "@rules_android//toolchains/android:android_default_toolchain",
+    "@rules_android//toolchains/android_sdk:android_sdk_tools",
+)
+
+kotlin_repositories()
+
+load("@rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
+
+kt_register_toolchains()
+
+load("@rules_jvm_external//:defs.bzl", "maven_install")
+
+maven_install(
+    name = "maven_rules_kotlin_example",
+    aar_import_bzl_label = "@rules_android//rules:rules.bzl",
+    artifacts = [
+        "org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:2.1.20",
         "androidx.core:core-ktx:1.15.0",
         "androidx.appcompat:appcompat:1.7.0",
         "androidx.activity:activity-compose:1.7.0",
@@ -76,49 +104,20 @@ KOTLIN_TO_COMPOSE = {
         "androidx.compose.ui:ui-tooling:1.7.6",
         "androidx.compose.runtime:runtime:1.7.6",
     ],
-}
-
-load("@rules_jvm_external//:defs.bzl", "maven_install")
-
-maven_install(
-    name = "maven",
-    artifacts = KOTLIN_TO_COMPOSE[KOTLINC_RELEASE.version],
     fetch_sources = True,
-    maven_install_json = "//:maven_install-%s.json" % KOTLINC_RELEASE.version,
+    maven_install_json = "//:maven_install.json",
     repositories = [
         "https://maven.google.com",
         "https://repo1.maven.org/maven2",
     ],
-    resolver = "coursier" if KOTLINC_RELEASE.version == "1.9.22" else "maven",
+    resolver = "maven",
+    use_starlark_android_rules = True,
 )
 
 load("@maven//:defs.bzl", "pinned_maven_install")
 
 pinned_maven_install()
 
-http_archive(
-    name = "bazel_skylib",
-    sha256 = versions.SKYLIB_SHA,
-    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/%s/bazel-skylib-%s.tar.gz" % (
-        versions.SKYLIB_VERSION,
-        versions.SKYLIB_VERSION,
-    )],
-)
-
-## Android
-
-http_archive(
-    name = "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],
-)
-
-load("@rules_android//android:rules.bzl", "android_sdk_repository")
+load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
 
-android_sdk_repository(name = "androidsdk")
-
-android_ndk_repository(
-    name = "androidndk",
-    api_level = 21,
-)
+robolectric_repositories()