Internal changes

RELNOTES=n/a PiperOrigin-RevId: 531463787
google · May 12, 2023 · 927aec0 · 927aec0
1 parent 8cf78a3
commit 927aec0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/java/dagger/hilt/processor/internal/aggregateddeps/PkgPrivateMetadata.java b/java/dagger/hilt/processor/internal/aggregateddeps/PkgPrivateMetadata.java
@@ -36,6 +36,11 @@ public static XTypeElement publicModule(XTypeElement element) {
     return publicDep(element, ClassNames.MODULE);
   }
 
+  /** Returns the public Hilt wrapped type or the type itself if it is already public. */
+  public static XTypeElement publicEntryPoint(XTypeElement element) {
+    return publicDep(element, ClassNames.ENTRY_POINT);
+  }
+
   /** Returns the public Hilt wrapped type or the type itself if it is already public. */
   public static XTypeElement publicEarlyEntryPoint(XTypeElement element) {
     return publicDep(element, ClassNames.EARLY_ENTRY_POINT);

diff --git a/java/dagger/internal/codegen/validation/SpiModelBindingGraphConverter.java b/java/dagger/internal/codegen/validation/SpiModelBindingGraphConverter.java
@@ -18,6 +18,7 @@
 
 import static androidx.room.compiler.processing.compat.XConverters.toJavac;
 import static androidx.room.compiler.processing.compat.XConverters.toKS;
+import static androidx.room.compiler.processing.compat.XConverters.toKSResolver;
 import static dagger.internal.codegen.extension.DaggerStreams.toImmutableList;
 import static dagger.internal.codegen.extension.DaggerStreams.toImmutableMap;
 import static dagger.internal.codegen.extension.DaggerStreams.toImmutableSet;
@@ -256,7 +257,7 @@ static DaggerProcessingEnv toSpiModel(XProcessingEnv env) {
       case JAVAC:
         return DaggerProcessingEnv.fromJavac(toJavac(env));
       case KSP:
-        return DaggerProcessingEnv.fromKsp(toKS(env));
+        return DaggerProcessingEnv.fromKsp(toKS(env), toKSResolver(env));
     }
     throw new IllegalStateException(
         String.format("Backend %s is not supported yet.", env.getBackend()));

diff --git a/java/dagger/spi/model/DaggerProcessingEnv.java b/java/dagger/spi/model/DaggerProcessingEnv.java
@@ -17,6 +17,7 @@
 package dagger.spi.model;
 
 import com.google.auto.value.AutoValue;
+import com.google.devtools.ksp.processing.Resolver;
 import com.google.devtools.ksp.processing.SymbolProcessorEnvironment;
 import javax.annotation.Nullable;
 import javax.annotation.processing.ProcessingEnvironment;
@@ -32,11 +33,11 @@ public static boolean isJavac(Backend backend) {
   }
 
   public static DaggerProcessingEnv fromJavac(ProcessingEnvironment env) {
-    return new AutoValue_DaggerProcessingEnv(env, null);
+    return new AutoValue_DaggerProcessingEnv(env, null, null);
   }
 
-  public static DaggerProcessingEnv fromKsp(SymbolProcessorEnvironment env) {
-    return new AutoValue_DaggerProcessingEnv(null, env);
+  public static DaggerProcessingEnv fromKsp(SymbolProcessorEnvironment env, Resolver resolver) {
+    return new AutoValue_DaggerProcessingEnv(null, env, resolver);
   }
 
   /**
@@ -49,6 +50,9 @@ public static DaggerProcessingEnv fromKsp(SymbolProcessorEnvironment env) {
   @Nullable
   public abstract SymbolProcessorEnvironment ksp();
 
+  @Nullable
+  public abstract Resolver resolver();
+
   /** Returns the backend used in this compilation. */
   public DaggerProcessingEnv.Backend backend() {
     if (java() != null) {