Fix tests by upgrading rules_kotlin, rules_android.

Fix gradle tests by upgrading to kotlin 2.1.0

Author: brettchabot

MODULE.bazel

@@ -1,18 +1,13 @@
 # These need needs to be consistent with their counterparts in build_extensions/axt_deps_versions.bzl.
-KOTLIN_VERSION = "1.8.20"
+KOTLIN_VERSION = "2.1.0"
 KOTLINX_COROUTINES_VERSION = "1.7.1" 
-#GRPC_VERSION = "1.54.1"
-# Get from https://github.com/JetBrains/kotlin/releases/
-#KOTLINC_RELEASE_SHA = "10df74c3c6e2eafd4c7a5572352d37cbe41774996e42de627023cb4c82b50ae4"
 
 bazel_dep(name = "rules_java", version = "8.6.0")
 bazel_dep(name = "rules_jvm_external", version = "6.6")
-bazel_dep(name = "rules_android", version = "0.6.0", repo_name = "build_bazel_rules_android")
-bazel_dep(name = "rules_kotlin", version = "1.9.6", repo_name = "io_bazel_rules_kotlin")
+bazel_dep(name = "rules_android", version = "0.6.3", repo_name = "build_bazel_rules_android")
+bazel_dep(name = "rules_kotlin", version = "2.1.3", repo_name = "io_bazel_rules_kotlin")
 bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
 bazel_dep(name = "grpc-java", version = "1.68.1")
-#needed?
-#bazel_dep(name = "rules_python", version = "0.37.1")
 bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
 
 # Pin the version of rules_robolectric so that it matches the robolectric version we get from maven.
@@ -42,104 +37,41 @@ maven.install(
     name = "maven",
     artifacts = [
         "androidx.annotation:annotation:1.7.0-beta01",
-#        "androidx.annotation:annotation-experimental:jar:1.1.0",
-#        "androidx.appcompat:appcompat:1.3.1",
         "androidx.concurrent:concurrent-futures:1.1.0",
         "androidx.concurrent:concurrent-futures-ktx:1.1.0",
         "androidx.core:core:1.6.0",
-#        "androidx.cursoradapter:cursoradapter:1.0.0",
-#        "androidx.drawerlayout:drawerlayout:1.1.1",
-#        "androidx.fragment:fragment:1.3.6",
-#        "androidx.legacy:legacy-support-core-ui:1.0.0",
-#        "androidx.legacy:legacy-support-core-utils:1.0.0",
-#        "androidx.legacy:legacy-support-v4:1.0.0",
         "androidx.lifecycle:lifecycle-common:2.3.1",
         "androidx.multidex:multidex:2.0.0",
-#        "androidx.recyclerview:recyclerview:1.2.1",
          "androidx.tracing:tracing:1.1.0",
-#        "androidx.test.uiautomator:uiautomator:2.2.0",
-#        "androidx.viewpager:viewpager:1.0.0",
-#        "androidx.window:window:1.1.0",
         "androidx.window:window-java:1.1.0",
         "androidx.window:window-core:1.1.0",
-#        "aopalliance:aopalliance:1.0",
-#        "com.android.tools.lint:lint-api:30.1.0",
-#        "com.android.tools.lint:lint-checks:30.1.0",
-#        "com.beust:jcommander:1.72",
-
-#        "com.google.android.material:material:1.4.0",
-#        "com.google.auto.value:auto-value:1.5.1",
-#        "com.google.code.findbugs:jsr305:3.0.2",
-#        "com.google.code.gson:gson:2.8.5",
         "com.google.dagger:dagger-compiler:2.46",
         "com.google.dagger:dagger-producers:2.46",
         "com.google.dagger:dagger:2.46",
-#        "com.google.errorprone:error_prone_annotations:2.9.0",
-#        "com.google.errorprone:javac-shaded:9-dev-r4023-3",
-#        "com.google.flogger:flogger-system-backend:0.4",
-#        "com.google.flogger:flogger:0.4",
-#        "com.google.flogger:google-extensions:0.4",
         "com.google.googlejavaformat:google-java-format:1.4",
-#        "com.google.guava:guava:30.1.1-android",
-#        "com.google.guava:listenablefuture:1.0",
-#        "com.google.inject.extensions:guice-multibindings:4.1.0",
-#        "com.google.inject:guice:4.1.0",
-#        "com.google.truth:truth:1.0",
-#        "com.googlecode.jarjar:jarjar:1.3",
-#        "com.linkedin.dexmaker:dexmaker-mockito:jar:2.28.1",
-#        "com.linkedin.dexmaker:dexmaker:2.28.1",
-#        "org.mockito.kotlin:mockito-kotlin:4.1.0",
         "com.squareup:javapoet:1.9.0",
         "io.grpc:grpc-okhttp:1.54.1",
         "io.grpc:grpc-stub:1.54.1",
-#        "org.apache.tomcat:annotations-api:6.0.53",
-#        "javax.annotation:javax.annotation-api:1.3.1",
-#        "javax.inject:javax.inject:1",
-#        "joda-time:joda-time:2.10.1",
         "junit:junit:4.13.2",
-#        "net.bytebuddy:byte-buddy-agent:1.9.10",
-#        "net.bytebuddy:byte-buddy:1.9.10",
-#        "net.sf.kxml:kxml2:jar:2.3.0",
         "org.ccil.cowan.tagsoup:tagsoup:1.2.1",
-#        "org.checkerframework:checker-compat-qual:2.5.5",
-#        "org.hamcrest:hamcrest-core:1.3",
         "org.hamcrest:hamcrest-library:1.3",
-#        "org.mockito:mockito-core:2.28.1",
-#        "org.objenesis:objenesis:2.6",
         "org.pantsbuild:jarjar:1.7.2",
         "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
         "org.jetbrains.kotlinx:kotlinx-coroutines-core:%s" % KOTLINX_COROUTINES_VERSION,
         "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:%s" % KOTLINX_COROUTINES_VERSION,
         "org.jetbrains.kotlinx:kotlinx-coroutines-android:%s" % KOTLINX_COROUTINES_VERSION,
-         "org.robolectric:robolectric:4.14.1",
-#        maven.artifact(
-#            artifact = "robolectric",
-#            exclusions = [
-#                # exclude the com.google.guava dependency since that require
-#                # java8 compatibility.
-#                maven.exclusion(
-#                    artifact = "guava",
-#                    group = "com.google.guava",
-#                ),
-#            ],
-#            group = "org.robolectric",
-#            version = "4.13",
-#        ),
+        "org.robolectric:robolectric:4.14.1",
     ],
     fetch_sources = True,
-#    generate_compat_repositories = True,
     repositories = [
         "https://maven.google.com",
         "https://repo1.maven.org/maven2",
         "https://dl.bintray.com/linkedin/maven",
     ],
 )
 
-
-
 use_repo(maven, "maven")
 
-
 # need to have a isolated version tree for listenablefuture, because otherwise
 # listenablefuture will get resolved to 9999.0-empty-to-avoid-conflict-with-guava
 maven.install(
@@ -155,79 +87,3 @@ maven.install(
 )
 use_repo(maven, "maven_listenablefuture")
 
-
-#android_sdk_repository(
-#    name = "androidsdk",
-#    api_level = 35,
-#    build_tools_version = "35.0.0",
-#)
-#
-#load("//:repo.bzl", "android_test_repositories")
-#
-#android_test_repositories(with_dev_repositories = True)
-#
-#load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
-#
-#robolectric_repositories()
-#
-## Kotlin toolchains
-#
-#rules_kotlin_version = "1.8-RC-12"
-#rules_kotlin_sha = "8e5c8ab087e0fa3fbb58e1f6b99d8fe40f75bac44994c3d208eba723284465d6"
-#
-#http_archive(
-#    name = "io_bazel_rules_kotlin",
-#    sha256 = rules_kotlin_sha,
-#    urls = ["https://github.com/bazelbuild/rules_kotlin/releases/download/v%s/rules_kotlin_release.tgz" % rules_kotlin_version],
-#)
-#
-#load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version")
-#
-#kotlin_repositories(
-#    compiler_release = kotlinc_version(
-#        release = KOTLIN_VERSION,
-#        sha256 = KOTLINC_RELEASE_SHA,
-#    ),
-#)
-#
-#load("@io_bazel_rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
-#
-#kt_register_toolchains()
-#
-## Android bazel rules from Dec 22 2022. This is the last commit that supports bazel 6.0.0
-#RULES_ANDROID_COMMIT = "ce37817d8589cac4a7cc20cb4d51fe8ad459dea1"
-#
-#RULES_ANDROID_SHA = "402b1ed3756028dca11835dad3225689a4040c3b377de798709f9a39b5c6af17"
-#
-#http_archive(
-#    name = "rules_android",
-#    sha256 = RULES_ANDROID_SHA,
-#    strip_prefix = "rules_android-%s" % RULES_ANDROID_COMMIT,
-#    url = "https://github.com/bazelbuild/rules_android/archive/%s.zip" % RULES_ANDROID_COMMIT,
-#)
-#
-#load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
-#
-#rules_android_prereqs()
-#
-#load("@rules_android//:defs.bzl", "rules_android_workspace")
-#
-#rules_android_workspace()
-#
-#register_toolchains(
-#    "@rules_android//toolchains/android:android_default_toolchain",
-#    "@rules_android//toolchains/android_sdk:android_sdk_tools",
-#)
-#
-## Updated 2023-02-01
-#http_archive(
-#    name = "rules_license",
-#    sha256 = "6157e1e68378532d0241ecd15d3c45f6e5cfd98fc10846045509fb2a7cc9e381",
-#    urls = [
-#        "https://github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz",
-#    ],
-#)
-#
-#load("@maven//:compat.bzl", "compat_repositories")
-#
-#compat_repositories()

build_extensions/axt_android_local_test.bzl

@@ -2,7 +2,7 @@
 
 load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library")
 load("//build_extensions:create_jar.bzl", "create_jar")
-load("@build_bazel_rules_android//android:rules.bzl", "android_local_test")
+load("@build_bazel_rules_android//android:rules.bzl", "android_local_test", "android_library")
 
 def axt_android_local_test(name, srcs = [], deps = [], manifest = "//build_extensions:AndroidManifest_robolectric.xml", tags = ["robolectric"], **kwargs):
     """A wrapper around android_local_test that provides sensible defaults for androidx.test.

gradle-tests/build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id 'com.android.library' version '8.5.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
     kotlinOptions {