Add support for converting XAnnotation to XAnnotationSpec via KotlinPoet.

MODULE.bazel

@@ -50,6 +50,8 @@ INCAP_VERSION = "0.2"
 
 KOTLIN_VERSION = "2.2.20"
 
+KOTLINPOET_VERSION = "2.2.0"
+
 KSP_VERSION = KOTLIN_VERSION + "-2.0.3"
 
 MAVEN_VERSION = "3.3.3"
@@ -141,8 +143,9 @@ maven.install(
         "com.google.guava:guava-beta-checker:1.0",
         "com.google.protobuf:protobuf-java:4.29.3",
         "com.squareup:javapoet:1.13.0",
-        "com.squareup:kotlinpoet:1.11.0",
-        "com.squareup:kotlinpoet-javapoet:1.11.0",
+        "com.squareup:kotlinpoet-javapoet:%s" % KOTLINPOET_VERSION,
+        "com.squareup:kotlinpoet-jvm:%s" % KOTLINPOET_VERSION,
+        "com.squareup:kotlinpoet-ksp:%s" % KOTLINPOET_VERSION,
         "io.github.java-diff-utils:java-diff-utils:4.11",
         "io.grpc:grpc-context:%s" % GRPC_VERSION,
         "io.grpc:grpc-core:%s" % GRPC_VERSION,

dagger-compiler/BUILD

@@ -63,7 +63,8 @@ gen_maven_artifact(
         "com.google.guava:failureaccess",
         "com.google.guava:guava",
         "com.squareup:javapoet",
-        "com.squareup:kotlinpoet",
+        "com.squareup:kotlinpoet-jvm",
+        "com.squareup:kotlinpoet-ksp",
         "javax.inject:javax.inject",
         "net.ltgt.gradle.incap:incap",
         "org.checkerframework:checker-compat-qual",

dagger-compiler/main/java/dagger/internal/codegen/xprocessing/BUILD

@@ -45,6 +45,7 @@ java_library(
         "//third_party/java/guava/collect",
         "//third_party/java/javapoet",
         "//third_party/kotlin/kotlinpoet",
+        "//third_party/kotlin/kotlinpoet:interop-ksp",
     ],
 )
 

dagger-compiler/main/java/dagger/internal/codegen/xprocessing/XAnnotationSpecs.java

@@ -19,6 +19,9 @@
 import static androidx.room3.compiler.codegen.compat.XConverters.toJavaPoet;
 import static androidx.room3.compiler.codegen.compat.XConverters.toKotlinPoet;
 import static androidx.room3.compiler.codegen.compat.XConverters.toXPoet;
+import static androidx.room3.compiler.processing.compat.XConverters.getProcessingEnv;
+import static androidx.room3.compiler.processing.compat.XConverters.toJavac;
+import static androidx.room3.compiler.processing.compat.XConverters.toKS;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 
@@ -28,31 +31,47 @@
 import androidx.room3.compiler.codegen.XTypeName;
 import androidx.room3.compiler.processing.JavaPoetExtKt;
 import androidx.room3.compiler.processing.XAnnotation;
+import androidx.room3.compiler.processing.XProcessingEnv;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.squareup.javapoet.AnnotationSpec;
+import com.squareup.kotlinpoet.ksp.AnnotationsKt;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
 /** Static factories to create {@link AnnotationSpec}s. */
 public final class XAnnotationSpecs {
+  public static XAnnotationSpec of(XClassName className) {
+    return builder(className).build();
+  }
+
   public static XAnnotationSpec of(XAnnotation annotation) {
+    return of(annotation, /* includeDefaultValues= */ false);
+  }
+
+  public static XAnnotationSpec of(XAnnotation annotation, boolean includeDefaultValues) {
     return toXPoet(
-        JavaPoetExtKt.toAnnotationSpec(annotation, /* includeDefaultValues= */ false),
-        // TODO(b/411661393): Add support for annotation values. For now, the KotlinPoet
-        // implementation only copies the class name and ignores the annotation values.
-        com.squareup.kotlinpoet.AnnotationSpec
-            .builder(toKotlinPoet(XAnnotations.asClassName(annotation)))
-            .build());
+        JavaPoetExtKt.toAnnotationSpec(annotation, includeDefaultValues),
+        toKAnnotationSpec(annotation, includeDefaultValues));
   }
 
-  public static XAnnotationSpec of(XClassName className) {
-    return builder(className).build();
+  @SuppressWarnings("StatementSwitchToExpressionSwitch") // Dagger targets Java 8 source.
+  private static com.squareup.kotlinpoet.AnnotationSpec toKAnnotationSpec(
+      XAnnotation annotation, boolean includeDefaultValues) {
+    XProcessingEnv processingEnv = getProcessingEnv(annotation);
+    switch (processingEnv.getBackend()) {
+      case JAVAC:
+        return com.squareup.kotlinpoet.AnnotationSpec.Companion.get(toJavac(annotation));
+      case KSP:
+        return AnnotationsKt.toAnnotationSpec(
+            toKS(annotation), /* omitDefaultValues= */ !includeDefaultValues);
+    }
+    throw new AssertionError("Unsupported backend: " + processingEnv.getBackend());
   }
 
   /** Values for an {@link SuppressWarnings} annotation. */

maven_install.json

@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -439239509,
-  "__RESOLVED_ARTIFACTS_HASH": -536649459,
+  "__INPUT_ARTIFACTS_HASH": 1202390130,
+  "__RESOLVED_ARTIFACTS_HASH": -334589348,
   "conflict_resolution": {
     "androidx.test:monitor:1.4.0": "androidx.test:monitor:1.8.0",
     "com.google.auto.value:auto-value-annotations:1.9": "com.google.auto.value:auto-value-annotations:1.11.0",
@@ -739,17 +739,23 @@
       },
       "version": "1.13.0"
     },
-    "com.squareup:kotlinpoet": {
+    "com.squareup:kotlinpoet-javapoet": {
       "shasums": {
-        "jar": "2887ada1ca03dd83baa2758640d87e840d1907564db0ef88d2289c868a980492"
+        "jar": "228dd31de97447209f1cc03d648117fbc4f7c39aa2ffab34f12b474921026fb0"
       },
-      "version": "1.11.0"
+      "version": "2.2.0"
     },
-    "com.squareup:kotlinpoet-javapoet": {
+    "com.squareup:kotlinpoet-jvm": {
       "shasums": {
-        "jar": "519cd84fa11bb01e6b305de4369d5244b128091823872471601b103044e1c41e"
+        "jar": "87ba83576e2bbda929e2d4d83035eaf7984b9adc0798837b8e8d1eb4953a17da"
       },
-      "version": "1.11.0"
+      "version": "2.2.0"
+    },
+    "com.squareup:kotlinpoet-ksp": {
+      "shasums": {
+        "jar": "368e7a7c25908c39fd3178e2177789c3d83fbf75092914c76cb67b640dbc5434"
+      },
+      "version": "2.2.0"
     },
     "com.sun.activation:javax.activation": {
       "shasums": {
@@ -1191,9 +1197,9 @@
     },
     "org.jetbrains.kotlin:kotlin-reflect": {
       "shasums": {
-        "jar": "3277ac102ae17aad10a55abec75ff5696c8d109790396434b496e75087854203"
+        "jar": "bcd75a36ca4ad8e06117214ed807f8dea2fe61a71e07f91ca14f4335024b8463"
       },
-      "version": "1.6.10"
+      "version": "2.1.21"
     },
     "org.jetbrains.kotlin:kotlin-script-runtime": {
       "shasums": {
@@ -1215,15 +1221,15 @@
     },
     "org.jetbrains.kotlin:kotlin-stdlib-jdk7": {
       "shasums": {
-        "jar": "2aedcdc6b69b33bdf5cc235bcea88e7cf6601146bb6bcdffdb312bbacd7be261"
+        "jar": "870d35fd266b2daf64c1080fe51824d3c368f7995384a8d7c5fc2fdc40eb7b3a"
       },
-      "version": "1.6.10"
+      "version": "1.6.0"
     },
     "org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
       "shasums": {
-        "jar": "1456d82d039ea30d8485b032901f52bbf07e7cdbe8bb1f8708ad32a8574c41ce"
+        "jar": "ab0547c495953214a5f2b28150014f4e02133678d52b77d76375ea235e443dbd"
       },
-      "version": "1.6.10"
+      "version": "1.6.0"
     },
     "org.jetbrains.kotlin:kotlin-test": {
       "shasums": {
@@ -2022,14 +2028,18 @@
       "org.checkerframework:checker-qual",
       "org.ow2.asm:asm"
     ],
-    "com.squareup:kotlinpoet": [
-      "org.jetbrains.kotlin:kotlin-reflect",
-      "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    ],
     "com.squareup:kotlinpoet-javapoet": [
       "com.squareup:javapoet",
-      "com.squareup:kotlinpoet",
-      "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+      "com.squareup:kotlinpoet-jvm",
+      "org.jetbrains.kotlin:kotlin-stdlib"
+    ],
+    "com.squareup:kotlinpoet-jvm": [
+      "org.jetbrains.kotlin:kotlin-reflect",
+      "org.jetbrains.kotlin:kotlin-stdlib"
+    ],
+    "com.squareup:kotlinpoet-ksp": [
+      "com.squareup:kotlinpoet-jvm",
+      "org.jetbrains.kotlin:kotlin-stdlib"
     ],
     "com.sun.istack:istack-commons-runtime": [
       "jakarta.activation:jakarta.activation-api"
@@ -5003,13 +5013,16 @@
     "com.squareup:javapoet": [
       "com.squareup.javapoet"
     ],
-    "com.squareup:kotlinpoet": [
+    "com.squareup:kotlinpoet-javapoet": [
+      "com.squareup.kotlinpoet.javapoet"
+    ],
+    "com.squareup:kotlinpoet-jvm": [
       "com.squareup.kotlinpoet",
       "com.squareup.kotlinpoet.jvm",
       "com.squareup.kotlinpoet.tags"
     ],
-    "com.squareup:kotlinpoet-javapoet": [
-      "com.squareup.kotlinpoet.javapoet"
+    "com.squareup:kotlinpoet-ksp": [
+      "com.squareup.kotlinpoet.ksp"
     ],
     "com.sun.activation:javax.activation": [
       "com.sun.activation.registries",
@@ -7196,14 +7209,15 @@
       "kotlin.reflect.jvm.internal.impl.types",
       "kotlin.reflect.jvm.internal.impl.types.checker",
       "kotlin.reflect.jvm.internal.impl.types.error",
+      "kotlin.reflect.jvm.internal.impl.types.extensions",
       "kotlin.reflect.jvm.internal.impl.types.model",
       "kotlin.reflect.jvm.internal.impl.types.typeUtil",
       "kotlin.reflect.jvm.internal.impl.types.typesApproximation",
       "kotlin.reflect.jvm.internal.impl.util",
       "kotlin.reflect.jvm.internal.impl.util.capitalizeDecapitalize",
       "kotlin.reflect.jvm.internal.impl.util.collectionUtils",
       "kotlin.reflect.jvm.internal.impl.utils",
-      "kotlin.reflect.jvm.internal.pcollections"
+      "kotlin.reflect.jvm.internal.impl.utils.addToStdlib"
     ],
     "org.jetbrains.kotlin:kotlin-script-runtime": [
       "kotlin.script.dependencies",
@@ -7630,7 +7644,7 @@
     ]
   },
   "repositories": {
-    "https://repo1.maven.org/maven2/": [
+    "https://maven.google.com/": [
       "androidx.activity:activity-ktx:aar",
       "androidx.activity:activity:aar",
       "androidx.annotation:annotation",
@@ -7750,8 +7764,9 @@
       "com.google.truth:truth",
       "com.ibm.icu:icu4j",
       "com.squareup:javapoet",
-      "com.squareup:kotlinpoet",
       "com.squareup:kotlinpoet-javapoet",
+      "com.squareup:kotlinpoet-jvm",
+      "com.squareup:kotlinpoet-ksp",
       "com.sun.activation:javax.activation",
       "com.sun.istack:istack-commons-runtime",
       "com.sun.xml.fastinfoset:FastInfoset",
@@ -7865,7 +7880,7 @@
       "xerces:xercesImpl",
       "xml-apis:xml-apis"
     ],
-    "https://maven.google.com/": [
+    "https://repo1.maven.org/maven2/": [
       "androidx.activity:activity-ktx:aar",
       "androidx.activity:activity:aar",
       "androidx.annotation:annotation",
@@ -7985,8 +8000,9 @@
       "com.google.truth:truth",
       "com.ibm.icu:icu4j",
       "com.squareup:javapoet",
-      "com.squareup:kotlinpoet",
       "com.squareup:kotlinpoet-javapoet",
+      "com.squareup:kotlinpoet-jvm",
+      "com.squareup:kotlinpoet-ksp",
       "com.sun.activation:javax.activation",
       "com.sun.istack:istack-commons-runtime",
       "com.sun.xml.fastinfoset:FastInfoset",

third_party/kotlin/kotlinpoet/BUILD

@@ -18,5 +18,10 @@ package(default_visibility = ["//:src"])
 
 alias(
     name = "kotlinpoet",
-    actual = "@maven//:com_squareup_kotlinpoet",
+    actual = "@maven//:com_squareup_kotlinpoet_jvm",
+)
+
+alias(
+    name = "interop-ksp",
+    actual = "@maven//:com_squareup_kotlinpoet_ksp",
 )