Update kotlin (and related dependencies) to 2.0.21.

This CL:

  * Updates Kotlin to 2.0.21
  * Updates KSP to 2.0.21-1.0.28
  * Updates kotlin-metadata-jvm to 2.0.21
  * Migrates kotlin-metadata-jvm usages to the new API (the pre-2.0.0 APIs are deprecated).
  * Updates XProcessing and XProcessing Testing jars
  * Adds flags to fall back to Kotlin 1.9 for compiler tests (Working on getting these tests working with K2/KSP2 is in progress).
  * Updated all of our artifact tests to use the same Kotlin and KSP versions.
  * Added `compat_kt_jvm_library` to alias output jars to the expected locations.

Fixes #4525

RELNOTES=Fixes #4525: Update kotlin-jvm-metadata to 2.0.21 to remove dependency on Beta version.
PiperOrigin-RevId: 702486745

Author: bcorso

WORKSPACE

@@ -147,7 +147,7 @@ http_archive(
 
 load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version")
 
-KOTLIN_VERSION = "1.9.24"
+KOTLIN_VERSION = "2.0.21"
 
 # Get from https://github.com/JetBrains/kotlin/releases/
 KOTLINC_RELEASE_SHA = "eb7b68e01029fa67bc8d060ee54c12018f2c60ddc438cf21db14517229aa693b"
@@ -203,7 +203,7 @@ GRPC_VERSION = "1.2.0"
 
 INCAP_VERSION = "0.2"
 
-KSP_VERSION = KOTLIN_VERSION + "-1.0.20"
+KSP_VERSION = KOTLIN_VERSION + "-1.0.28"
 
 MAVEN_VERSION = "3.3.3"
 
@@ -245,6 +245,8 @@ maven_install(
         "com.google.code.findbugs:jsr305:3.0.1",
         "com.google.devtools.ksp:symbol-processing:%s" % KSP_VERSION,
         "com.google.devtools.ksp:symbol-processing-api:%s" % KSP_VERSION,
+        "com.google.devtools.ksp:symbol-processing-common-deps:%s" % KSP_VERSION,
+        "com.google.devtools.ksp:symbol-processing-aa-embeddable:%s" % KSP_VERSION,
         "com.google.errorprone:error_prone_annotation:%s" % ERROR_PRONE_VERSION,
         "com.google.errorprone:error_prone_annotations:%s" % ERROR_PRONE_VERSION,
         "com.google.errorprone:error_prone_check_api:%s" % ERROR_PRONE_VERSION,
@@ -291,7 +293,7 @@ maven_install(
         "org.jetbrains.kotlin:kotlin-compiler-embeddable:%s" % KOTLIN_VERSION,
         "org.jetbrains.kotlin:kotlin-daemon-embeddable:%s" % KOTLIN_VERSION,
         "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
-        "org.jetbrains.kotlin:kotlin-metadata-jvm:2.0.0-Beta5",
+        "org.jetbrains.kotlin:kotlin-metadata-jvm:%s" % KOTLIN_VERSION,
         "org.jspecify:jspecify:1.0.0",
         "org.mockito:mockito-core:2.28.2",
         "org.pantsbuild:jarjar:1.7.2",

java/dagger/hilt/android/plugin/build.gradle

@@ -1,8 +1,8 @@
 buildscript {
   ext {
-    kotlin_version = "1.9.24"
+    kotlin_version = "2.0.21"
     agp_version = System.getenv('AGP_VERSION') ?: "8.1.1"
-    ksp_version = "$kotlin_version-1.0.20"
+    ksp_version = "$kotlin_version-1.0.28"
     pluginArtifactId = 'hilt-android-gradle-plugin'
     pluginId = 'com.google.dagger.hilt.android'
   }

java/dagger/hilt/android/testing/compile/BUILD

@@ -41,7 +41,6 @@ java_library(
         "//java/dagger/hilt/processor/internal/uninstallmodules:processor_lib",
         "//java/dagger/internal/codegen:processor",
         "//java/dagger/internal/codegen/extension",
-        "//java/dagger/internal/codegen/xprocessing",
         "//java/dagger/internal/codegen/xprocessing:xprocessing-testing",
         "//java/dagger/testing/compile",
         "//third_party/java/auto:value",

java/dagger/hilt/android/testing/compile/HiltCompilerTests.java

@@ -70,6 +70,14 @@
 
 /** {@link Compiler} instances for testing Android Hilt. */
 public final class HiltCompilerTests {
+  private static final ImmutableList<String> DEFAULT_JAVAC_OPTIONS = ImmutableList.of();
+
+  private static final ImmutableList<String> DEFAULT_KOTLINC_OPTIONS =
+      ImmutableList.of(
+          "-api-version=1.9",
+          "-language-version=1.9",
+          "-P", "plugin:org.jetbrains.kotlin.kapt3:correctErrorTypes=true");
+
   /** Returns the {@link XProcessingEnv.Backend} for the given {@link CompilationResultSubject}. */
   public static XProcessingEnv.Backend backend(CompilationResultSubject subject) {
     return CompilerTests.backend(subject);
@@ -161,9 +169,8 @@ public static void compileWithKapt(
                 sources,
                 /* classpath= */ ImmutableList.of(CompilerTests.compilerDepsJar()),
                 /* inheritClasspath= */ false,
-                /* javacArguments= */ ImmutableList.of(),
-                /* kotlincArguments= */ ImmutableList.of(
-                    ),
+                /* javacArguments= */ DEFAULT_JAVAC_OPTIONS,
+                /* kotlincArguments= */ DEFAULT_KOTLINC_OPTIONS,
                 /* kaptProcessors= */ ImmutableList.<Processor>builder()
                     .addAll(defaultProcessors())
                     .addAll(additionalProcessors)
@@ -275,10 +282,12 @@ public void compile(Consumer<CompilationResultSubject> onCompilationResult) {
           sources().asList(),
           /* classpath= */ ImmutableList.of(CompilerTests.compilerDepsJar()),
           /* options= */ processorOptions(),
-          /* javacArguments= */ javacArguments().asList(),
-          /* kotlincArguments= */ ImmutableList.of(
-              "-P",
-              "plugin:org.jetbrains.kotlin.kapt3:correctErrorTypes=true"),
+          /* javacArguments= */
+          ImmutableList.<String>builder()
+              .addAll(DEFAULT_JAVAC_OPTIONS)
+              .addAll(javacArguments())
+              .build(),
+          /* kotlincArguments= */ DEFAULT_KOTLINC_OPTIONS,
           /* config= */ HiltProcessingEnvConfigs.CONFIGS,
           /* javacProcessors= */ ImmutableList.<Processor>builder()
               .addAll(mergeProcessors(defaultProcessors(), additionalJavacProcessors()))

java/dagger/hilt/processor/internal/kotlin/BUILD

@@ -15,13 +15,16 @@
 # Description:
 #   Sources related to Kotlin metadata.
 
-load("@rules_java//java:defs.bzl", "java_library")
+load("//tools:bazel_compat.bzl", "compat_kt_jvm_library")
 
 package(default_visibility = ["//:src"])
 
-java_library(
+compat_kt_jvm_library(
     name = "kotlin",
-    srcs = glob(["*.java"]),
+    srcs = glob([
+        "*.java",
+        "*.kt",
+    ]),
     deps = [
         "//:dagger_with_compiler",
         "//java/dagger/hilt/processor/internal:classnames",

java/dagger/hilt/processor/internal/kotlin/ClassMetadata.kt

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2023 The Dagger Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dagger.hilt.processor.internal.kotlin
+
+import androidx.room.compiler.processing.XAnnotation
+import androidx.room.compiler.processing.XFieldElement
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XTypeElement
+import kotlin.Metadata
+import kotlin.metadata.declaresDefaultValue
+import kotlin.metadata.KmClass
+import kotlin.metadata.KmConstructor
+import kotlin.metadata.KmFunction
+import kotlin.metadata.KmProperty
+import kotlin.metadata.KmValueParameter
+import kotlin.metadata.jvm.KotlinClassMetadata
+import kotlin.metadata.jvm.fieldSignature
+import kotlin.metadata.jvm.getterSignature
+import kotlin.metadata.jvm.signature
+import kotlin.metadata.jvm.syntheticMethodForAnnotations
+
+/** Container classes for kotlin metadata types. */
+class ClassMetadata private constructor(private val kmClass: KmClass) {
+  val functionsBySignature = buildList<FunctionMetadata> {
+    addAll(kmClass.constructors.map { ConstructorMetadata(it) })
+    addAll(kmClass.functions.map { MethodMetadata(it) })
+  }.associateBy { it.signature }
+
+  val propertiesBySignature =
+      kmClass.properties
+          .filter { it.fieldSignature != null }
+          .map { PropertyMetadata(it) }
+          .associateBy { it.fieldSignature }
+
+  fun constructors(): List<FunctionMetadata> =
+      functionsBySignature.values.filterIsInstance<ConstructorMetadata>()
+
+  companion object {
+    /** Parse Kotlin class metadata from a given type element. */
+    @JvmStatic
+    fun of(typeElement: XTypeElement): ClassMetadata {
+      val metadataAnnotation = checkNotNull(typeElement.getAnnotation(Metadata::class)).value
+      return when (val classMetadata = KotlinClassMetadata.readStrict(metadataAnnotation)) {
+        is KotlinClassMetadata.Class -> ClassMetadata(classMetadata.kmClass)
+        else -> error("Unsupported metadata type: ${classMetadata}")
+      }
+    }
+  }
+}
+
+class ConstructorMetadata(private val kmConstructor: KmConstructor) : FunctionMetadata {
+  override val name = "<init>"
+  override val signature = kmConstructor.signature!!.toString()
+  override val parameters = kmConstructor.valueParameters.map { ParameterMetadata(it) }
+}
+
+class MethodMetadata(private val kmFunction: KmFunction) : FunctionMetadata {
+  override val name = kmFunction.name
+  override val signature = kmFunction.signature!!.toString()
+  override val parameters = kmFunction.valueParameters.map { ParameterMetadata(it) }
+}
+
+interface FunctionMetadata {
+  val name: String
+  val signature: String
+  val parameters: List<ParameterMetadata>
+}
+
+class PropertyMetadata(private val kmProperty: KmProperty) {
+  val name = kmProperty.name
+
+  /** Returns the JVM field descriptor of the backing field of this property. */
+  val fieldSignature = kmProperty.fieldSignature?.toString()
+
+  val getterSignature = kmProperty.getterSignature?.toString()
+
+  /** Returns JVM method descriptor of the synthetic method for property annotations. */
+  val methodForAnnotationsSignature = kmProperty.syntheticMethodForAnnotations?.toString()
+}
+
+class ParameterMetadata(private val kmValueParameter: KmValueParameter) {
+  val name = kmValueParameter.name
+
+  fun declaresDefaultValue() = kmValueParameter.declaresDefaultValue
+}
+