Update gradle extension setup

square · Aug 3, 2023 · 99658b3 · 99658b3
1 parent e67fbd1
commit 99658b3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/gradle-plugin/src/main/java/com/squareup/anvil/plugin/AnvilExtension.kt b/gradle-plugin/src/main/java/com/squareup/anvil/plugin/AnvilExtension.kt
@@ -51,10 +51,10 @@ public abstract class AnvilExtension @Inject constructor(objects: ObjectFactory)
     .convention(false)
 
   /**
-   * Enables experimental KSP support. This is only useful if using Dagger with KSP and if
-   * [disableComponentMerging] is set to `false`.
+   * Enables experimental KSP support in component merging. This is only
+   * useful if using Dagger with KSP and if [disableComponentMerging] is set to `false`.
    */
-  public val useKsp: Property<Boolean> = objects.property(Boolean::class.java)
+  public val enableKspComponentMerging: Property<Boolean> = objects.property(Boolean::class.java)
     .convention(false)
 
   @Suppress("PropertyName")

diff --git a/gradle-plugin/src/main/java/com/squareup/anvil/plugin/AnvilPlugin.kt b/gradle-plugin/src/main/java/com/squareup/anvil/plugin/AnvilPlugin.kt
@@ -50,10 +50,12 @@ internal open class AnvilPlugin : KotlinCompilerPluginSupportPlugin {
       // TODO would be nice if KSP made this a property so these
       //  could be chained nicely without afterEvaluate
       target.afterEvaluate {
-        if (anvilExtension.useKsp.get()) {
+        if (anvilExtension.enableKspComponentMerging.get()) {
           target.extensions.configure(KspExtension::class.java) { kspExtension ->
             kspExtension.excludeProcessor("dagger.internal.codegen.KspComponentProcessor")
           }
+
+          target.dependencies.add("ksp", "$GROUP:compiler:$VERSION")
         }
       }
     }
@@ -140,9 +142,11 @@ internal open class AnvilPlugin : KotlinCompilerPluginSupportPlugin {
     project.configurations.getByName(variant.compilerPluginClasspathName)
       .extendsFrom(getConfiguration(project, variant.name))
 
-    disableIncrementalKotlinCompilation(variant)
+    if (!variant.variantFilter.enableKspComponentMerging) {
+     disableIncrementalKotlinCompilation(variant)
+    }
 
-    if (!variant.variantFilter.generateDaggerFactoriesOnly) {
+    if (!variant.variantFilter.generateDaggerFactoriesOnly || !variant.variantFilter.enableKspComponentMerging) {
       disableCorrectErrorTypes(variant)
 
       kotlinCompilation.dependencies {

diff --git a/gradle-plugin/src/main/java/com/squareup/anvil/plugin/VariantFilter.kt b/gradle-plugin/src/main/java/com/squareup/anvil/plugin/VariantFilter.kt
@@ -38,10 +38,10 @@ public interface VariantFilter : Named {
   public var syncGeneratedSources: Boolean
 
   /**
-   * Enables experimental KSP support. This is only useful if using Dagger with KSP and if
-   * [disableComponentMerging] is set to `false`.
+   * Enables experimental KSP support in component merging. This is only
+   * useful if using Dagger with KSP and if [disableComponentMerging] is set to `false`.
    */
-  public var useKsp: Boolean
+  public var enableKspComponentMerging: Boolean
 }
 
 internal class CommonFilter(
@@ -80,8 +80,8 @@ internal class CommonFilter(
     }
 
   private var useKspOverride: Boolean? = null
-  override var useKsp: Boolean
-    get() = useKspOverride ?: extension.useKsp.get()
+  override var enableKspComponentMerging: Boolean
+    get() = useKspOverride ?: extension.enableKspComponentMerging.get()
     set(value) {
       useKspOverride = value
     }