Improve the helper to include dagger code generation.

Add it to `app` and `appnav` modules.
element-hq · Sep 30, 2024 · 84465b3 · 84465b3
1 parent b447275
commit 84465b3
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 26 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -19,14 +19,13 @@ import extension.allLibrariesImpl
 import extension.allServicesImpl
 import extension.koverDependencies
 import extension.locales
+import extension.setupAnvil
 import extension.setupKover
 import java.util.Locale
 
 plugins {
     id("io.element.android-compose-application")
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.anvil)
-    alias(libs.plugins.kapt)
     // When using precompiled plugins, we need to apply the firebase plugin like this
     id(libs.plugins.firebaseAppDistribution.get().pluginId)
     alias(libs.plugins.knit)
@@ -233,6 +232,11 @@ knit {
     }
 }
 
+setupAnvil(
+    generateDaggerCode = true,
+    generateDaggerFactoriesUsingAnvil = false,
+)
+
 dependencies {
     allLibrariesImpl()
     allServicesImpl()
@@ -244,11 +248,9 @@ dependencies {
     }
     allFeaturesImpl(rootDir, logger)
     implementation(projects.features.migration.api)
-    implementation(projects.anvilannotations)
     implementation(projects.appnav)
     implementation(projects.appconfig)
     implementation(projects.libraries.uiStrings)
-    anvil(projects.anvilcodegen)
 
     if (ModulesConfig.pushProvidersConfig.includeFirebase) {
         "gplayImplementation"(projects.libraries.pushproviders.firebase)
@@ -274,9 +276,6 @@ dependencies {
 
     implementation(libs.matrix.emojibase.bindings)
 
-    implementation(libs.dagger)
-    kapt(libs.dagger.compiler)
-
     testImplementation(libs.test.junit)
     testImplementation(libs.test.robolectric)
     testImplementation(libs.coroutines.test)

diff --git a/appnav/build.gradle.kts b/appnav/build.gradle.kts
@@ -8,24 +8,20 @@
 @file:Suppress("UnstableApiUsage")
 
 import extension.allFeaturesApi
+import extension.setupAnvil
 
 plugins {
     id("io.element.android-compose-library")
-    alias(libs.plugins.anvil)
-    alias(libs.plugins.kapt)
     id("kotlin-parcelize")
 }
 
 android {
     namespace = "io.element.android.appnav"
 }
 
-dependencies {
-    implementation(projects.anvilannotations)
-    anvil(projects.anvilcodegen)
-    implementation(libs.dagger)
-    kapt(libs.dagger.compiler)
+setupAnvil()
 
+dependencies {
     allFeaturesApi(rootDir, logger)
 
     implementation(projects.libraries.core)

diff --git a/plugins/src/main/kotlin/extension/AnvilExtensions.kt b/plugins/src/main/kotlin/extension/AnvilExtensions.kt
@@ -9,24 +9,48 @@ package extension
 
 import org.gradle.api.Project
 import com.squareup.anvil.plugin.AnvilExtension
+import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.kotlin.dsl.the
 
 /**
  * Setup Anvil plugin with the given configuration.
- * @param generateDaggerFactories whether to generate Dagger factories using Anvil
+ * @param generateDaggerCode whether to enable general Dagger code generation using Kapt
+ * @param generateDaggerFactoriesUsingAnvil whether to generate Dagger factories using Anvil instead of Kapt
  */
-fun Project.setupAnvil(generateDaggerFactories: Boolean = true) {
-    plugins.apply("com.squareup.anvil")
+fun Project.setupAnvil(
+    generateDaggerCode: Boolean = false,
+    generateDaggerFactoriesUsingAnvil: Boolean = true,
+) {
+    val libs = the<LibrariesForLibs>()
+    // Apply plugins and dependencies
+    applyPluginIfNeeded("com.squareup.anvil")
+
+    if (generateDaggerCode) {
+        applyPluginIfNeeded("org.jetbrains.kotlin.kapt")
+        // Needed at the top level since dagger code should be generated at a single point for performance
+        dependencies.add("implementation", libs.dagger)
+        dependencies.add("kapt", libs.dagger.compiler)
+    }
+
+    // These dependencies are only needed for compose library or application modules
+    if (project.pluginManager.hasPlugin("io.element.android-compose-library")
+        || project.pluginManager.hasPlugin("io.element.android-compose-application")) {
+        // Annotations to generate DI code for Appyx nodes
+        dependencies.add("implementation", project.project(":anvilannotations"))
+        // Code generator for the annotations above
+        dependencies.add("anvil", project.project(":anvilcodegen"))
+    }
+
     project.pluginManager.withPlugin("com.squareup.anvil") {
+        // Setup extension
         extensions.configure(AnvilExtension::class.java) {
-            this.generateDaggerFactories.set(generateDaggerFactories)
-
-            // These dependencies are only needed for compose libraries
-            if (project.pluginManager.hasPlugin("io.element.android-compose-library")) {
-                // Annotations to generate DI code for Appyx nodes
-                dependencies.add("implementation", project.project(":anvilannotations"))
-                // Code generator for the annotations above
-                dependencies.add("anvil", project.project(":anvilcodegen"))
-            }
+            this.generateDaggerFactories.set(generateDaggerFactoriesUsingAnvil)
         }
     }
 }
+
+private fun Project.applyPluginIfNeeded(pluginId: String) {
+    if (!pluginManager.hasPlugin(pluginId)) {
+        pluginManager.apply(pluginId)
+    }
+}