Remove dagger and anvil dependencies, try to simplify gradle build scripts a bit

2025-08-25 09:21:20 +02:00
parent f23a493d4c
commit dca1c5b516
34 changed files with 8 additions and 57 deletions
--- a/anvilcodegen/build.gradle.kts
+++ b/anvilcodegen/build.gradle.kts
@@ -11,8 +11,8 @@ plugins {

 dependencies {
    implementation(projects.anvilannotations)
-    implementation(libs.anvil.compiler.utils)
    implementation(libs.metro.runtime)
+    implementation(libs.kotlin.compiler)
    implementation(libs.kotlinpoet)
    implementation(libs.ksp.plugin)
    implementation(libs.kotlinpoet.ksp)
--- a/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt
+++ b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt
@@ -56,9 +56,9 @@ class ContributesNodeProcessor(
        if (validSymbols.isEmpty()) return invalidSymbols

        for (ksClass in validSymbols) {
-//            if (config.enableLogging) {
+            if (config.enableLogging) {
                logger.warn("Processing ${ksClass.qualifiedName?.asString()}")
-//            }
+            }
            generateModule(ksClass)
            generateFactory(ksClass)
        }
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -36,7 +36,7 @@ plugins {
    alias(libs.plugins.licensee)
    alias(libs.plugins.kotlin.serialization)
    // To be able to update the firebase.xml files, uncomment and build the project
-    // id("com.google.gms.google-services")
+    // alias(libs.plugins.gms.google.services)
 }

 setupKover()
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,24 +5,15 @@
 * Please see LICENSE files in the repository root for full details.
 */

-buildscript {
-    dependencies {
-        classpath(libs.kotlin.gradle.plugin)
-        classpath(libs.gms.google.services)
-    }
-}
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
    id("io.element.android-root")
+    alias(libs.plugins.kotlin.jvm) apply false
    alias(libs.plugins.android.application) apply false
    alias(libs.plugins.android.library) apply false
    alias(libs.plugins.kotlin.android) apply false
    alias(libs.plugins.compose.compiler) apply false
    alias(libs.plugins.ksp) apply false
-    alias(libs.plugins.anvil) apply false
-    alias(libs.plugins.kotlin.jvm) apply false
-    alias(libs.plugins.kapt) apply false
    alias(libs.plugins.dependencycheck) apply false
    alias(libs.plugins.dependencyanalysis)
    alias(libs.plugins.detekt)
--- a/features/location/impl/build.gradle.kts
+++ b/features/location/impl/build.gradle.kts
@@ -37,8 +37,6 @@ dependencies {
    implementation(projects.services.analytics.api)
    implementation(libs.accompanist.permission)
    implementation(projects.libraries.uiStrings)
-    implementation(libs.dagger)
-
    testImplementation(libs.test.junit)
    testImplementation(libs.coroutines.test)
    testImplementation(libs.molecule.runtime)
--- a/features/networkmonitor/impl/build.gradle.kts
+++ b/features/networkmonitor/impl/build.gradle.kts
@@ -19,7 +19,6 @@ android {

 dependencies {
    implementation(libs.coroutines.core)
-    implementation(libs.dagger)
    implementation(projects.libraries.core)
    implementation(projects.libraries.di)
    api(projects.features.networkmonitor.api)
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -50,8 +50,6 @@ haze = "1.6.10"
 dependencyAnalysis = "2.19.0"

 # DI
-dagger = "2.57.1"
-anvil = "0.4.1"
 metro = "0.6.3"

 # Auto service
@@ -67,14 +65,13 @@ android_gradle_plugin = { module = "com.android.tools.build:gradle", version.ref
 compose_compiler_plugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
 # https://developer.android.com/studio/write/java8-support#library-desugaring-versions
 android_desugar = "com.android.tools:desugar_jdk_libs:2.1.5"
-anvil_gradle_plugin = { module = "dev.zacsweers.anvil:gradle-plugin", version.ref = "anvil" }
 kotlin_gradle_plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 metro_gradle_plugin = { module = "dev.zacsweers.metro:gradle-plugin", version.ref = "metro" }
+kotlin_compiler = { module = "org.jetbrains.kotlin:kotlin-compiler", version.ref = "kotlin" }
 kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
 kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" }
 kover_gradle_plugin = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kover" }
 ksp_gradle_plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
-gms_google_services = "com.google.gms:google-services:4.4.3"
 # https://firebase.google.com/docs/android/setup#available-libraries
 google_firebase_bom = "com.google.firebase:firebase-bom:34.2.0"
 firebase_appdistribution_gradle = { module = "com.google.firebase:firebase-appdistribution-gradle", version.ref = "firebaseAppDistribution" }
@@ -211,12 +208,7 @@ sigpwned_emoji4j = "com.sigpwned:emoji4j-core:16.0.0"

 # Di
 inject = "javax.inject:javax.inject:1"
-dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
-dagger_compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
 metro_runtime = { module = "dev.zacsweers.metro:runtime", version.ref = "metro" }
-metro_compiler = { module = "dev.zacsweers.metro:compiler", version.ref = "metro" }
-anvil_compiler_api = { module = "dev.zacsweers.anvil:compiler-api", version.ref = "anvil" }
-anvil_compiler_utils = { module = "dev.zacsweers.anvil:compiler-utils", version.ref = "anvil" }

 # Element Call
 element_call_embedded = "io.element.android:element-call-embedded:0.15.0"
@@ -236,9 +228,7 @@ android_library = { id = "com.android.library", version.ref = "android_gradle_pl
 kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin_jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin_serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-anvil = { id = "dev.zacsweers.anvil", version.ref = "anvil" }
 metro = { id = "dev.zacsweers.metro", version.ref = "metro" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 ktlint = "org.jlleitschuh.gradle.ktlint:13.1.0"
@@ -252,3 +242,4 @@ knit = { id = "org.jetbrains.kotlinx.knit", version = "0.5.0" }
 sonarqube = "org.sonarqube:6.3.1.5724"
 licensee = "app.cash.licensee:1.13.0"
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+gms_google_services = { id = "com.google.gms.google-services", version = "4.4.3" }
--- a/libraries/androidutils/build.gradle.kts
+++ b/libraries/androidutils/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {

    implementation(projects.libraries.core)
    implementation(projects.services.toolbox.api)
-    implementation(libs.dagger)
    implementation(libs.timber)
    implementation(libs.androidx.corektx)
    implementation(libs.androidx.activity.activity)
--- a/libraries/audio/impl/build.gradle.kts
+++ b/libraries/audio/impl/build.gradle.kts
@@ -20,6 +20,5 @@ dependencies {
    api(projects.libraries.audio.api)

    implementation(libs.androidx.corektx)
-    implementation(libs.dagger)
    implementation(projects.libraries.di)
 }
--- a/libraries/cryptography/impl/build.gradle.kts
+++ b/libraries/cryptography/impl/build.gradle.kts
@@ -18,7 +18,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.libraries.di)
    api(projects.libraries.cryptography.api)

--- a/libraries/dateformatter/impl/build.gradle.kts
+++ b/libraries/dateformatter/impl/build.gradle.kts
@@ -31,7 +31,6 @@ android {
    }

    dependencies {
-        implementation(libs.dagger)
        implementation(projects.libraries.core)
        implementation(projects.libraries.designsystem)
        implementation(projects.libraries.di)
--- a/libraries/deeplink/impl/build.gradle.kts
+++ b/libraries/deeplink/impl/build.gradle.kts
@@ -20,7 +20,6 @@ setupDependencyInjection()
 dependencies {
    api(projects.libraries.deeplink.api)
    implementation(projects.libraries.di)
-    implementation(libs.dagger)
    implementation(libs.androidx.corektx)
    implementation(projects.libraries.core)
    implementation(projects.libraries.matrix.api)
--- a/libraries/featureflag/impl/build.gradle.kts
+++ b/libraries/featureflag/impl/build.gradle.kts
@@ -20,7 +20,6 @@ setupDependencyInjection()

 dependencies {
    api(projects.libraries.featureflag.api)
-    implementation(libs.dagger)
    implementation(libs.androidx.datastore.preferences)
    implementation(projects.appconfig)
    implementation(projects.libraries.di)
--- a/libraries/indicator/impl/build.gradle.kts
+++ b/libraries/indicator/impl/build.gradle.kts
@@ -18,7 +18,6 @@ android {
 }

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.libraries.di)
    implementation(projects.libraries.featureflag.api)
    implementation(projects.libraries.matrix.api)
--- a/libraries/matrix/api/build.gradle.kts
+++ b/libraries/matrix/api/build.gradle.kts
@@ -43,7 +43,6 @@ android {

 dependencies {
    implementation(projects.libraries.di)
-    implementation(libs.dagger)
    implementation(projects.libraries.androidutils)
    implementation(projects.libraries.core)
    implementation(projects.services.analytics.api)
--- a/libraries/matrix/impl/build.gradle.kts
+++ b/libraries/matrix/impl/build.gradle.kts
@@ -35,7 +35,6 @@ dependencies {
    implementation(projects.services.analytics.api)
    implementation(projects.services.toolbox.api)
    api(projects.libraries.matrix.api)
-    implementation(libs.dagger)
    implementation(projects.libraries.core)
    implementation("net.java.dev.jna:jna:5.17.0@aar")
    implementation(libs.androidx.datastore.preferences)
--- a/libraries/mediaplayer/impl/build.gradle.kts
+++ b/libraries/mediaplayer/impl/build.gradle.kts
@@ -20,7 +20,6 @@ dependencies {
    api(projects.libraries.mediaplayer.api)
    implementation(libs.androidx.media3.exoplayer)

-    implementation(libs.dagger)
    implementation(projects.libraries.audio.api)
    implementation(projects.libraries.core)
    implementation(projects.libraries.di)
--- a/libraries/mediaviewer/impl/build.gradle.kts
+++ b/libraries/mediaviewer/impl/build.gradle.kts
@@ -24,8 +24,6 @@ setupDependencyInjection()

 dependencies {
    implementation(libs.coroutines.core)
-    implementation(libs.dagger)
-
    implementation(libs.coil.compose)
    implementation(libs.androidx.media3.exoplayer)
    implementation(libs.androidx.media3.ui)
--- a/libraries/network/build.gradle.kts
+++ b/libraries/network/build.gradle.kts
@@ -23,7 +23,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.libraries.core)
    implementation(projects.libraries.di)
    implementation(projects.libraries.matrix.api)
--- a/libraries/preferences/impl/build.gradle.kts
+++ b/libraries/preferences/impl/build.gradle.kts
@@ -19,7 +19,6 @@ setupDependencyInjection()

 dependencies {
    api(projects.libraries.preferences.api)
-    implementation(libs.dagger)
    implementation(libs.androidx.datastore.preferences)
    implementation(projects.libraries.androidutils)
    implementation(projects.libraries.di)
--- a/libraries/push/impl/build.gradle.kts
+++ b/libraries/push/impl/build.gradle.kts
@@ -25,7 +25,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(libs.androidx.corektx)
    implementation(libs.androidx.datastore.preferences)
    implementation(platform(libs.network.retrofit.bom))
--- a/libraries/pushproviders/firebase/build.gradle.kts
+++ b/libraries/pushproviders/firebase/build.gradle.kts
@@ -48,7 +48,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(libs.androidx.corektx)
    implementation(projects.features.enterprise.api)
    implementation(projects.libraries.architecture)
--- a/libraries/pushproviders/unifiedpush/build.gradle.kts
+++ b/libraries/pushproviders/unifiedpush/build.gradle.kts
@@ -18,7 +18,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.features.enterprise.api)
    implementation(projects.libraries.androidutils)
    implementation(projects.libraries.core)
--- a/libraries/pushstore/impl/build.gradle.kts
+++ b/libraries/pushstore/impl/build.gradle.kts
@@ -22,7 +22,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.libraries.architecture)
    implementation(projects.libraries.androidutils)
    implementation(projects.libraries.core)
--- a/libraries/session-storage/impl/build.gradle.kts
+++ b/libraries/session-storage/impl/build.gradle.kts
@@ -18,7 +18,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.libraries.androidutils)
    implementation(projects.libraries.core)
    implementation(projects.libraries.encryptedDb)
--- a/libraries/troubleshoot/impl/build.gradle.kts
+++ b/libraries/troubleshoot/impl/build.gradle.kts
@@ -24,7 +24,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.libraries.architecture)
    implementation(projects.libraries.designsystem)
    implementation(projects.libraries.di)
--- a/libraries/voicerecorder/impl/build.gradle.kts
+++ b/libraries/voicerecorder/impl/build.gradle.kts
@@ -20,7 +20,6 @@ dependencies {
    api(projects.libraries.voicerecorder.api)
    api(libs.opusencoder)

-    implementation(libs.dagger)
    implementation(projects.appconfig)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.core)
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -22,7 +22,6 @@ dependencies {
    implementation(libs.firebase.appdistribution.gradle)
    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
    implementation(libs.autonomousapps.dependencyanalysis.plugin)
-    implementation(libs.anvil.gradle.plugin)
    implementation(libs.metro.gradle.plugin)
    implementation(libs.ksp.gradle.plugin)
    implementation(libs.compose.compiler.plugin)
--- a/services/analytics/noop/build.gradle.kts
+++ b/services/analytics/noop/build.gradle.kts
@@ -17,7 +17,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.libraries.architecture)
    implementation(projects.libraries.di)
    api(projects.services.analytics.api)
--- a/services/analyticsproviders/posthog/build.gradle.kts
+++ b/services/analyticsproviders/posthog/build.gradle.kts
@@ -34,7 +34,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(libs.posthog) {
        exclude("com.android.support", "support-annotations")
    }
--- a/services/analyticsproviders/sentry/build.gradle.kts
+++ b/services/analyticsproviders/sentry/build.gradle.kts
@@ -37,7 +37,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(libs.sentry)
    implementation(projects.libraries.core)
    implementation(projects.libraries.di)
--- a/services/apperror/impl/build.gradle.kts
+++ b/services/apperror/impl/build.gradle.kts
@@ -18,7 +18,6 @@ android {
 }

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.libraries.core)
    implementation(projects.libraries.di)
    implementation(projects.libraries.designsystem)
--- a/services/appnavstate/impl/build.gradle.kts
+++ b/services/appnavstate/impl/build.gradle.kts
@@ -18,7 +18,6 @@ android {
 }

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.libraries.core)
    implementation(projects.libraries.di)
    implementation(projects.libraries.matrix.api)
--- a/services/toolbox/impl/build.gradle.kts
+++ b/services/toolbox/impl/build.gradle.kts
@@ -17,7 +17,6 @@ android {
 setupDependencyInjection()

 dependencies {
-    implementation(libs.dagger)
    implementation(projects.libraries.androidutils)
    implementation(projects.libraries.di)
    api(projects.services.toolbox.api)