Merge pull request #5253 from element-hq/metro-v2

Migrate Anvil KSP to Metro

anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt

@@ -13,7 +13,7 @@ import kotlin.reflect.KClass
  * Adds Node to the specified component graph.
  * Equivalent to the following declaration:
  *
- * @Module
+ * @BindingContainer
  * @ContributesTo(Scope::class)
  * abstract class YourNodeModule {
 

anvilcodegen/build.gradle.kts

@@ -11,10 +11,9 @@ plugins {
 
 dependencies {
     implementation(projects.anvilannotations)
-    api(libs.anvil.compiler.api)
+    implementation(libs.metro.runtime)
-    implementation(libs.anvil.compiler.utils)
+    implementation(libs.kotlin.compiler)
     implementation(libs.kotlinpoet)
-    implementation(libs.dagger)
     implementation(libs.ksp.plugin)
     implementation(libs.kotlinpoet.ksp)
 }

anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt

@@ -19,7 +19,6 @@ import com.google.devtools.ksp.symbol.KSAnnotated
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSType
 import com.google.devtools.ksp.validate
-import com.squareup.anvil.annotations.ContributesTo
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.FileSpec
@@ -30,12 +29,12 @@ import com.squareup.kotlinpoet.STAR
 import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.ksp.toTypeName
 import com.squareup.kotlinpoet.ksp.writeTo
-import dagger.Binds
+import dev.zacsweers.metro.Assisted
-import dagger.Module
+import dev.zacsweers.metro.AssistedFactory
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.BindingContainer
-import dagger.assisted.AssistedFactory
+import dev.zacsweers.metro.Binds
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.ContributesTo
-import dagger.multibindings.IntoMap
+import dev.zacsweers.metro.IntoMap
 import io.element.android.anvilannotations.ContributesNode
 import org.jetbrains.kotlin.name.FqName
 
@@ -77,9 +76,8 @@ class ContributesNodeProcessor(
             fileName = moduleClassName,
         )
             .addType(
-                TypeSpec.classBuilder(moduleClassName)
+                TypeSpec.interfaceBuilder(moduleClassName)
-                    .addModifiers(KModifier.ABSTRACT)
+                    .addAnnotation(BindingContainer::class)
-                    .addAnnotation(Module::class)
                     .addAnnotation(AnnotationSpec.builder(ContributesTo::class).addMember("%T::class", scope.toTypeName()).build())
                     .addFunction(
                         FunSpec.builder("bind${ksClass.simpleName.asString()}Factory")
@@ -103,7 +101,7 @@ class ContributesNodeProcessor(
         content.writeTo(
             codeGenerator = codeGenerator,
             dependencies = Dependencies(
-                aggregating = true,
+                aggregating = false,
                 ksClass.containingFile!!
             ),
         )
@@ -113,23 +111,23 @@ class ContributesNodeProcessor(
     private fun generateFactory(ksClass: KSClassDeclaration) {
         val generatedPackage = ksClass.packageName.asString()
         val assistedFactoryClassName = "${ksClass.simpleName.asString()}_AssistedFactory"
-        val constructor = ksClass.getConstructors().singleOrNull { it.isAnnotationPresent(AssistedInject::class) }
+        val constructor = ksClass.getConstructors().first { it.parameters.isNotEmpty() }
-        val assistedParameters = constructor?.parameters?.filter { it.isAnnotationPresent(Assisted::class) }.orEmpty()
+        val assistedParameters = constructor.parameters.filter { it.isAnnotationPresent(Assisted::class) }
-        if (constructor == null || assistedParameters.size != 2) {
+        if (assistedParameters.size != 2) {
             error(
-                "${ksClass.qualifiedName} must have an @AssistedInject constructor with 2 @Assisted parameters",
+                "${ksClass.qualifiedName?.asString()} must have an @Inject constructor with 2 @Assisted parameters. Found: ${assistedParameters.size}",
             )
         }
         val contextAssistedParam = assistedParameters[0]
         if (contextAssistedParam.name?.asString() != "buildContext") {
             error(
-                "${ksClass.qualifiedName} @Assisted parameter must be named buildContext",
+                "${ksClass.qualifiedName?.asString()} @Assisted parameter must be named buildContext",
             )
         }
         val pluginsAssistedParam = assistedParameters[1]
         if (pluginsAssistedParam.name?.asString() != "plugins") {
             error(
-                "${ksClass.qualifiedName} @Assisted parameter must be named plugins",
+                "${ksClass.qualifiedName?.asString()} @Assisted parameter must be named plugins",
             )
         }
 
@@ -156,7 +154,7 @@ class ContributesNodeProcessor(
         content.writeTo(
             codeGenerator = codeGenerator,
             dependencies = Dependencies(
-                aggregating = true,
+                aggregating = false,
                 ksClass.containingFile!!
             ),
         )

app/build.gradle.kts

@@ -13,7 +13,6 @@ import com.android.build.gradle.tasks.GenerateBuildConfig
 import com.google.firebase.appdistribution.gradle.firebaseAppDistribution
 import config.BuildTimeConfig
 import extension.AssetCopyTask
-import extension.ComponentMergingStrategy
 import extension.GitBranchNameValueSource
 import extension.GitRevisionValueSource
 import extension.allEnterpriseImpl
@@ -23,7 +22,7 @@ import extension.allServicesImpl
 import extension.buildConfigFieldStr
 import extension.koverDependencies
 import extension.locales
-import extension.setupAnvil
+import extension.setupDependencyInjection
 import extension.setupKover
 import java.util.Locale
 
@@ -37,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()
@@ -248,11 +247,7 @@ knit {
     }
 }
 
-setupAnvil(
+setupDependencyInjection()
-    generateDaggerCode = true,
-    generateDaggerFactoriesUsingAnvil = false,
-    componentMergingStrategy = ComponentMergingStrategy.KSP,
-)
 
 dependencies {
     allLibrariesImpl()

app/src/main/kotlin/io/element/android/x/ElementXApplication.kt

@@ -9,16 +9,16 @@ package io.element.android.x
 
 import android.app.Application
 import androidx.startup.AppInitializer
+import dev.zacsweers.metro.createGraphFactory
 import io.element.android.features.cachecleaner.api.CacheCleanerInitializer
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
-import io.element.android.x.di.AppComponent
+import io.element.android.x.di.AppGraph
-import io.element.android.x.di.DaggerAppComponent
 import io.element.android.x.info.logApplicationInfo
 import io.element.android.x.initializer.CrashInitializer
 import io.element.android.x.initializer.PlatformInitializer
 
-class ElementXApplication : Application(), DaggerComponentOwner {
+class ElementXApplication : Application(), DependencyInjectionGraphOwner {
-    override val daggerComponent: AppComponent = DaggerAppComponent.factory().create(this)
+    override val graph: AppGraph = createGraphFactory<AppGraph.Factory>().create(this)
 
     override fun onCreate() {
         super.onCreate()

app/src/main/kotlin/io/element/android/x/MainNode.kt

@@ -21,8 +21,8 @@ import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.appnav.RootFlowNode
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.ApplicationContext
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.annotations.ApplicationContext
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 
@@ -38,8 +38,8 @@ class MainNode(
     buildContext = buildContext,
     plugins = plugins,
 ),
-    DaggerComponentOwner {
+    DependencyInjectionGraphOwner {
-    override val daggerComponent = (context as DaggerComponentOwner).daggerComponent
+    override val graph = (context as DependencyInjectionGraphOwner).graph
 
     override fun resolve(navTarget: RootNavTarget, buildContext: BuildContext): Node {
         return createNode<RootFlowNode>(buildContext = buildContext)

app/src/main/kotlin/io/element/android/x/di/AppBindings.kt

@@ -7,7 +7,8 @@
 
 package io.element.android.x.di
 
-import com.squareup.anvil.annotations.ContributesTo
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesTo
 import io.element.android.features.api.MigrationEntryPoint
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.lockscreen.api.LockScreenEntryPoint
@@ -15,7 +16,6 @@ import io.element.android.features.lockscreen.api.LockScreenService
 import io.element.android.features.rageshake.api.reporter.BugReporter
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.matrix.api.platform.InitPlatformService
 import io.element.android.libraries.matrix.api.tracing.TracingService

app/src/main/kotlin/io/element/android/x/di/AppComponent.kt

@@ -1,28 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.x.di
-
-import android.content.Context
-import com.squareup.anvil.annotations.MergeComponent
-import dagger.BindsInstance
-import io.element.android.libraries.architecture.NodeFactoriesBindings
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.ApplicationContext
-import io.element.android.libraries.di.SingleIn
-
-@SingleIn(AppScope::class)
-@MergeComponent(AppScope::class)
-interface AppComponent : NodeFactoriesBindings {
-    @MergeComponent.Factory
-    interface Factory {
-        fun create(
-            @ApplicationContext @BindsInstance
-            context: Context
-        ): AppComponent
-    }
-}

app/src/main/kotlin/io/element/android/x/di/AppGraph.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.x.di
+
+import android.content.Context
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.DependencyGraph
+import dev.zacsweers.metro.Provides
+import io.element.android.libraries.architecture.NodeFactoriesBindings
+import io.element.android.libraries.di.annotations.ApplicationContext
+
+@DependencyGraph(AppScope::class)
+interface AppGraph : NodeFactoriesBindings {
+    val sessionGraphFactory: SessionGraph.Factory
+
+    @DependencyGraph.Factory
+    interface Factory {
+        fun create(
+            @ApplicationContext @Provides
+            context: Context
+        ): AppGraph
+    }
+}

app/src/main/kotlin/io/element/android/x/di/AppModule.kt

@@ -11,9 +11,11 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
-import com.squareup.anvil.annotations.ContributesTo
+import dev.zacsweers.metro.AppScope
-import dagger.Module
+import dev.zacsweers.metro.BindingContainer
-import dagger.Provides
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Provides
+import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.ApplicationConfig
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.messages.impl.timeline.components.customreaction.DefaultEmojibaseProvider
@@ -23,11 +25,10 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.core.meta.BuildType
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.BaseDirectory
-import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.di.CacheDirectory
-import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.x.BuildConfig
 import io.element.android.x.R
 import kotlinx.coroutines.CoroutineName
@@ -37,10 +38,11 @@ import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.plus
 import java.io.File
 
-@Module
+@BindingContainer
 @ContributesTo(AppScope::class)
 object AppModule {
     @Provides
+    @BaseDirectory
     fun providesBaseDirectory(@ApplicationContext context: Context): File {
         return File(context.filesDir, "sessions")
     }

app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt

@@ -7,20 +7,19 @@
 
 package io.element.android.x.di
 
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.appnav.di.RoomComponentFactory
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import javax.inject.Inject
 
 @ContributesBinding(SessionScope::class)
-class DefaultRoomComponentFactory @Inject constructor(
+@Inject
-    private val roomComponentBuilder: RoomComponent.Builder
+class DefaultRoomComponentFactory(
+    private val sessionGraph: SessionGraph,
 ) : RoomComponentFactory {
     override fun create(room: JoinedRoom): Any {
-        return roomComponentBuilder
+        return sessionGraph.roomGraphFactory
-            .joinedRoom(room)
+            .create(room, room)
-            .baseRoom(room)
-            .build()
     }
 }

app/src/main/kotlin/io/element/android/x/di/DefaultSessionComponentFactory.kt

@@ -1,23 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.x.di
-
-import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.appnav.di.SessionComponentFactory
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.matrix.api.MatrixClient
-import javax.inject.Inject
-
-@ContributesBinding(AppScope::class)
-class DefaultSessionComponentFactory @Inject constructor(
-    private val sessionComponentBuilder: SessionComponent.Builder
-) : SessionComponentFactory {
-    override fun create(client: MatrixClient): Any {
-        return sessionComponentBuilder.client(client).build()
-    }
-}

app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023, 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.x.di
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import io.element.android.appnav.di.SessionGraphFactory
+import io.element.android.libraries.matrix.api.MatrixClient
+
+@ContributesBinding(AppScope::class)
+@Inject
+class DefaultSessionGraphFactory(
+    private val appGraph: AppGraph
+) : SessionGraphFactory {
+    override fun create(client: MatrixClient): Any {
+        return appGraph.sessionGraphFactory.create(client)
+    }
+}

app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt

@@ -1,38 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.x.di
-
-import com.squareup.anvil.annotations.ContributesTo
-import com.squareup.anvil.annotations.MergeSubcomponent
-import dagger.BindsInstance
-import io.element.android.libraries.architecture.NodeFactoriesBindings
-import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.di.SingleIn
-import io.element.android.libraries.matrix.api.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.JoinedRoom
-
-@SingleIn(RoomScope::class)
-@MergeSubcomponent(RoomScope::class)
-interface RoomComponent : NodeFactoriesBindings {
-    @MergeSubcomponent.Builder
-    interface Builder {
-        @BindsInstance
-        fun joinedRoom(room: JoinedRoom): Builder
-
-        @BindsInstance
-        fun baseRoom(room: BaseRoom): Builder
-
-        fun build(): RoomComponent
-    }
-
-    @ContributesTo(SessionScope::class)
-    interface ParentBindings {
-        fun roomComponentBuilder(): Builder
-    }
-}

app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.x.di
+
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.GraphExtension
+import dev.zacsweers.metro.Provides
+import io.element.android.libraries.architecture.NodeFactoriesBindings
+import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+
+@GraphExtension(RoomScope::class)
+interface RoomGraph : NodeFactoriesBindings {
+    @ContributesTo(SessionScope::class)
+    @GraphExtension.Factory
+    interface Factory {
+        fun create(
+            @Provides joinedRoom: JoinedRoom,
+            @Provides baseRoom: BaseRoom
+        ): RoomGraph
+    }
+}

app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.x.di
-
-import com.squareup.anvil.annotations.ContributesTo
-import com.squareup.anvil.annotations.MergeSubcomponent
-import dagger.BindsInstance
-import io.element.android.libraries.architecture.NodeFactoriesBindings
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.di.SingleIn
-import io.element.android.libraries.matrix.api.MatrixClient
-
-@SingleIn(SessionScope::class)
-@MergeSubcomponent(SessionScope::class)
-interface SessionComponent : NodeFactoriesBindings {
-    @MergeSubcomponent.Builder
-    interface Builder {
-        @BindsInstance
-        fun client(matrixClient: MatrixClient): Builder
-
-        fun build(): SessionComponent
-    }
-
-    @ContributesTo(AppScope::class)
-    interface ParentBindings {
-        fun sessionComponentBuilder(): Builder
-    }
-}

app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.x.di
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.GraphExtension
+import dev.zacsweers.metro.Provides
+import io.element.android.libraries.architecture.NodeFactoriesBindings
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.MatrixClient
+
+@GraphExtension(SessionScope::class)
+interface SessionGraph : NodeFactoriesBindings {
+    val roomGraphFactory: RoomGraph.Factory
+
+    @ContributesTo(AppScope::class)
+    @GraphExtension.Factory
+    interface Factory {
+        fun create(@Provides matrixClient: MatrixClient): SessionGraph
+    }
+}

app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt

@@ -10,19 +10,20 @@ package io.element.android.x.intent
 import android.content.Context
 import android.content.Intent
 import androidx.core.net.toUri
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.deeplink.api.DeepLinkCreator
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.annotations.ApplicationContext
-import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.push.impl.intent.IntentProvider
 import io.element.android.x.MainActivity
-import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class DefaultIntentProvider @Inject constructor(
+@Inject
+class DefaultIntentProvider(
     @ApplicationContext private val context: Context,
     private val deepLinkCreator: DeepLinkCreator,
 ) : IntentProvider {

app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt

@@ -7,15 +7,16 @@
 
 package io.element.android.x.oidc
 
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
-import io.element.android.libraries.di.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
 import io.element.android.services.toolbox.api.strings.StringProvider
 import io.element.android.x.R
-import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class DefaultOidcRedirectUrlProvider @Inject constructor(
+@Inject
+class DefaultOidcRedirectUrlProvider(
     private val stringProvider: StringProvider,
 ) : OidcRedirectUrlProvider {
     override fun provide() = buildString {

appnav/build.gradle.kts

@@ -8,7 +8,7 @@
 @file:Suppress("UnstableApiUsage")
 
 import extension.allFeaturesApi
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 plugins {
     id("io.element.android-compose-library")
@@ -19,7 +19,7 @@ android {
     namespace = "io.element.android.appnav"
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     allFeaturesApi(project)

appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt

@@ -22,15 +22,15 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.AppScope
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.appnav.di.SessionComponentFactory
+import io.element.android.appnav.di.SessionGraphFactory
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
-import io.element.android.libraries.di.DaggerComponentOwner
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 import kotlinx.parcelize.Parcelize
@@ -41,10 +41,11 @@ import kotlinx.parcelize.Parcelize
  * This allow to inject objects with SessionScope in the constructor of [LoggedInFlowNode].
  */
 @ContributesNode(AppScope::class)
-class LoggedInAppScopeFlowNode @AssistedInject constructor(
+@Inject
+class LoggedInAppScopeFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    sessionComponentFactory: SessionComponentFactory,
+    sessionGraphFactory: SessionGraphFactory,
     private val imageLoaderHolder: ImageLoaderHolder,
 ) : ParentNode<LoggedInAppScopeFlowNode.NavTarget>(
     navModel = PermanentNavModel(
@@ -53,7 +54,7 @@ class LoggedInAppScopeFlowNode @AssistedInject constructor(
     ),
     buildContext = buildContext,
     plugins = plugins
-), DaggerComponentOwner {
+), DependencyInjectionGraphOwner {
     interface Callback : Plugin {
         fun onOpenBugReport()
     }
@@ -66,7 +67,7 @@ class LoggedInAppScopeFlowNode @AssistedInject constructor(
     ) : NodeInputs
 
     private val inputs: Inputs = inputs()
-    override val daggerComponent = sessionComponentFactory.create(inputs.matrixClient)
+    override val graph = sessionGraphFactory.create(inputs.matrixClient)
 
     override fun onBuilt() {
         super.onBuilt()

appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt

@@ -7,6 +7,7 @@
 
 package io.element.android.appnav
 
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
@@ -18,9 +19,9 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import javax.inject.Inject
 
-class LoggedInEventProcessor @Inject constructor(
+@Inject
+class LoggedInEventProcessor(
     private val snackbarDispatcher: SnackbarDispatcher,
     private val roomMembershipObserver: RoomMembershipObserver,
 ) {

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -36,8 +36,9 @@ import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
 import com.bumble.appyx.navmodel.backstack.operation.replace
 import com.bumble.appyx.navmodel.backstack.operation.singleTop
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.AppScope
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appnav.loggedin.LoggedInNode
@@ -67,7 +68,6 @@ import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.waitForNavTargetAttached
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.MatrixClient
@@ -100,7 +100,8 @@ import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toKotlinDuration
 
 @ContributesNode(SessionScope::class)
-class LoggedInFlowNode @AssistedInject constructor(
+@Inject
+class LoggedInFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val homeEntryPoint: HomeEntryPoint,
@@ -560,14 +561,15 @@ class LoggedInFlowNode @AssistedInject constructor(
             }
         }
     }
-
-    @ContributesNode(AppScope::class)
-    class PlaceholderNode @AssistedInject constructor(
-        @Assisted buildContext: BuildContext,
-        @Assisted plugins: List<Plugin>,
-    ) : Node(buildContext, plugins = plugins)
 }
 
+@ContributesNode(AppScope::class)
+@Inject
+class PlaceholderNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+) : Node(buildContext, plugins = plugins)
+
 @Parcelize
 private class AttachRoomOperation(
     val roomTarget: LoggedInFlowNode.NavTarget.Room,

appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt

@@ -20,8 +20,9 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.AppScope
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.login.api.LoginEntryPoint
 import io.element.android.features.login.api.LoginParams
@@ -31,12 +32,12 @@ import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.designsystem.utils.ForceOrientationInMobileDevices
 import io.element.android.libraries.designsystem.utils.ScreenOrientation
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.ui.media.NotLoggedInImageLoaderFactory
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(AppScope::class)
-class NotLoggedInFlowNode @AssistedInject constructor(
+@Inject
+class NotLoggedInFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val loginEntryPoint: LoginEntryPoint,

appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt

@@ -23,8 +23,9 @@ import com.bumble.appyx.core.state.MutableSavedStateMap
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.AppScope
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appnav.di.MatrixSessionCache
@@ -46,7 +47,6 @@ import io.element.android.libraries.architecture.waitForChildAttached
 import io.element.android.libraries.core.uri.ensureProtocol
 import io.element.android.libraries.deeplink.api.DeeplinkData
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
@@ -61,7 +61,8 @@ import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 
 @ContributesNode(AppScope::class)
-class RootFlowNode @AssistedInject constructor(
+@Inject
+class RootFlowNode(
     @Assisted val buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val authenticationService: MatrixAuthenticationService,

appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt

@@ -10,9 +10,10 @@ package io.element.android.appnav.di
 import androidx.annotation.VisibleForTesting
 import com.bumble.appyx.core.state.MutableSavedStateMap
 import com.bumble.appyx.core.state.SavedStateMap
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
-import io.element.android.libraries.di.AppScope
+import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.di.SingleIn
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
@@ -22,7 +23,6 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
 import java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
 
 private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHolder.SaveInstanceKey"
 
@@ -33,7 +33,8 @@ private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHold
  */
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-class MatrixSessionCache @Inject constructor(
+@Inject
+class MatrixSessionCache(
     private val authenticationService: MatrixAuthenticationService,
     private val syncOrchestratorFactory: SyncOrchestrator.Factory,
 ) : MatrixClientProvider {

appnav/src/main/kotlin/io/element/android/appnav/di/SessionGraphFactory.kt

@@ -9,6 +9,6 @@ package io.element.android.appnav.di
 
 import io.element.android.libraries.matrix.api.MatrixClient
 
-interface SessionComponentFactory {
+interface SessionGraphFactory {
     fun create(client: MatrixClient): Any
 }

appnav/src/main/kotlin/io/element/android/appnav/di/SyncOrchestrator.kt

@@ -8,9 +8,9 @@
 package io.element.android.appnav.di
 
 import androidx.annotation.VisibleForTesting
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedFactory
+import dev.zacsweers.metro.AssistedFactory
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -30,7 +30,8 @@ import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
-class SyncOrchestrator @AssistedInject constructor(
+@Inject
+class SyncOrchestrator(
     @Assisted matrixClient: MatrixClient,
     private val appForegroundStateService: AppForegroundStateService,
     private val networkMonitor: NetworkMonitor,

appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt

@@ -8,6 +8,7 @@
 package io.element.android.appnav.intent
 
 import android.content.Intent
+import dev.zacsweers.metro.Inject
 import io.element.android.features.login.api.LoginIntentResolver
 import io.element.android.features.login.api.LoginParams
 import io.element.android.libraries.deeplink.api.DeeplinkData
@@ -17,7 +18,6 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.oidc.api.OidcAction
 import io.element.android.libraries.oidc.api.OidcIntentResolver
 import timber.log.Timber
-import javax.inject.Inject
 
 sealed interface ResolvedIntent {
     data class Navigation(val deeplinkData: DeeplinkData) : ResolvedIntent
@@ -27,7 +27,8 @@ sealed interface ResolvedIntent {
     data class IncomingShare(val intent: Intent) : ResolvedIntent
 }
 
-class IntentResolver @Inject constructor(
+@Inject
+class IntentResolver(
     private val deeplinkParser: DeeplinkParser,
     private val loginIntentResolver: LoginIntentResolver,
     private val oidcIntentResolver: OidcIntentResolver,

appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt

@@ -13,13 +13,14 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
-class LoggedInNode @AssistedInject constructor(
+@Inject
+class LoggedInNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val loggedInPresenter: LoggedInPresenter,

appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt

@@ -17,6 +17,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.CryptoSessionStateChange
 import im.vector.app.features.analytics.plan.UserProperties
 import io.element.android.libraries.architecture.AsyncData
@@ -42,11 +43,11 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 private val pusherTag = LoggerTag("Pusher", LoggerTag.PushLoggerTag)
 
-class LoggedInPresenter @Inject constructor(
+@Inject
+class LoggedInPresenter(
     private val matrixClient: MatrixClient,
     private val syncService: SyncService,
     private val pushService: PushService,

appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt

@@ -7,6 +7,7 @@
 
 package io.element.android.appnav.loggedin
 
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.media.MediaPreviewService
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
@@ -14,13 +15,13 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 /**
  * This migration is temporary, will be safe to remove after some time.
  * The goal is to set the server config if it's not set, and remove the local data.
  */
-class MediaPreviewConfigMigration @Inject constructor(
+@Inject
+class MediaPreviewConfigMigration(
     private val mediaPreviewService: MediaPreviewService,
     private val appPreferencesStore: AppPreferencesStore,
     @SessionCoroutineScope

appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt

@@ -8,9 +8,10 @@
 package io.element.android.appnav.loggedin
 
 import androidx.annotation.VisibleForTesting
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.sync.SyncState
@@ -21,13 +22,13 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import javax.inject.Inject
 
 @VisibleForTesting
 const val SEND_QUEUES_RETRY_DELAY_MILLIS = 500L
 
 @SingleIn(SessionScope::class)
-class SendQueues @Inject constructor(
+@Inject
+class SendQueues(
     private val matrixClient: MatrixClient,
     private val syncService: SyncService,
 ) {

appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt

@@ -21,8 +21,8 @@ import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appnav.room.joined.JoinedRoomFlowNode
@@ -63,7 +63,8 @@ import java.util.Optional
 import kotlin.jvm.optionals.getOrNull
 
 @ContributesNode(SessionScope::class)
-class RoomFlowNode @AssistedInject constructor(
+@Inject
+class RoomFlowNode(
     @Assisted val buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val client: MatrixClient,

appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt

@@ -24,8 +24,8 @@ import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appnav.room.RoomNavigationTarget
 import io.element.android.libraries.architecture.BackstackView
@@ -45,7 +45,8 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(SessionScope::class)
-class JoinedRoomFlowNode @AssistedInject constructor(
+@Inject
+class JoinedRoomFlowNode(
     @Assisted val buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     loadingRoomStateFlowFactory: LoadingRoomStateFlowFactory,

appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt

@@ -17,8 +17,8 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.push
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appnav.di.RoomComponentFactory
 import io.element.android.appnav.room.RoomNavigationTarget
@@ -28,7 +28,7 @@ import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.MatrixClient
@@ -45,7 +45,8 @@ import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 
 @ContributesNode(SessionScope::class)
-class JoinedRoomLoadedFlowNode @AssistedInject constructor(
+@Inject
+class JoinedRoomLoadedFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val messagesEntryPoint: MessagesEntryPoint,
@@ -67,7 +68,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
     ),
     buildContext = buildContext,
     plugins = plugins,
-), DaggerComponentOwner {
+), DependencyInjectionGraphOwner {
     interface Callback : Plugin {
         fun onOpenRoom(roomId: RoomId, serverNames: List<String>)
         fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
@@ -82,7 +83,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
 
     private val inputs: Inputs = inputs()
     private val callbacks = plugins.filterIsInstance<Callback>()
-    override val daggerComponent = roomComponentFactory.create(inputs.room)
+    override val graph = roomComponentFactory.create(inputs.room)
 
     init {
         lifecycle.subscribe(

appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt

@@ -9,6 +9,7 @@ package io.element.android.appnav.root
 
 import com.bumble.appyx.core.state.MutableSavedStateMap
 import com.bumble.appyx.core.state.SavedStateMap
+import dev.zacsweers.metro.Inject
 import io.element.android.appnav.di.MatrixSessionCache
 import io.element.android.features.preferences.api.CacheService
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
@@ -18,7 +19,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onEach
-import javax.inject.Inject
 
 private const val SAVE_INSTANCE_KEY = "io.element.android.x.RootNavStateFlowFactory.SAVE_INSTANCE_KEY"
 
@@ -26,7 +26,8 @@ private const val SAVE_INSTANCE_KEY = "io.element.android.x.RootNavStateFlowFact
  * This class is responsible for creating a flow of [RootNavState].
  * It gathers data from multiple datasource and creates a unique one.
  */
-class RootNavStateFlowFactory @Inject constructor(
+@Inject
+class RootNavStateFlowFactory(
     private val authenticationService: MatrixAuthenticationService,
     private val cacheService: CacheService,
     private val matrixSessionCache: MatrixSessionCache,

appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt

@@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.SuperProperties
 import io.element.android.features.rageshake.api.crash.CrashDetectionState
 import io.element.android.features.rageshake.api.detection.RageshakeDetectionState
@@ -18,9 +19,9 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.SdkMetadata
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.apperror.api.AppErrorStateService
-import javax.inject.Inject
 
-class RootPresenter @Inject constructor(
+@Inject
+class RootPresenter(
     private val crashDetectionPresenter: Presenter<CrashDetectionState>,
     private val rageshakeDetectionPresenter: Presenter<RageshakeDetectionState>,
     private val appErrorStateService: AppErrorStateService,

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)

enterprise

@@ -1 +1 @@
-Subproject commit 9c78fd98e895ca8bf92ffc6604111155c8759cc0
+Subproject commit 95789d40119499eba8a79284df9dd2306405b099

features/analytics/impl/build.gradle.kts

@@ -1,4 +1,4 @@
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2023, 2024 New Vector Ltd.
@@ -16,7 +16,7 @@ android {
     namespace = "io.element.android.features.analytics.impl"
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     implementation(projects.libraries.androidutils)

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt

@@ -14,16 +14,17 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.AppScope
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appconfig.AnalyticsConfig
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
-import io.element.android.libraries.di.AppScope
 
 @ContributesNode(AppScope::class)
-class AnalyticsOptInNode @AssistedInject constructor(
+@Inject
+class AnalyticsOptInNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val presenter: AnalyticsOptInPresenter,

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenter.kt

@@ -9,6 +9,7 @@ package io.element.android.features.analytics.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
+import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.AnalyticsConfig
 import io.element.android.features.analytics.api.AnalyticsOptInEvents
 import io.element.android.libraries.architecture.Presenter
@@ -16,9 +17,9 @@ import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
-class AnalyticsOptInPresenter @Inject constructor(
+@Inject
+class AnalyticsOptInPresenter(
     private val buildMeta: BuildMeta,
     private val analyticsService: AnalyticsService,
 ) : Presenter<AnalyticsOptInState> {

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPoint.kt

@@ -9,14 +9,15 @@ package io.element.android.features.analytics.impl
 
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.analytics.api.AnalyticsEntryPoint
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.AppScope
-import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class DefaultAnalyticsEntryPoint @Inject constructor() : AnalyticsEntryPoint {
+@Inject
+class DefaultAnalyticsEntryPoint : AnalyticsEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<AnalyticsOptInNode>(buildContext)
     }

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/di/AnalyticsModule.kt

@@ -7,16 +7,16 @@
 
 package io.element.android.features.analytics.impl.di
 
-import com.squareup.anvil.annotations.ContributesTo
+import dev.zacsweers.metro.AppScope
-import dagger.Binds
+import dev.zacsweers.metro.BindingContainer
-import dagger.Module
+import dev.zacsweers.metro.Binds
+import dev.zacsweers.metro.ContributesTo
 import io.element.android.features.analytics.api.preferences.AnalyticsPreferencesState
 import io.element.android.features.analytics.impl.preferences.AnalyticsPreferencesPresenter
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.di.AppScope
 
 @ContributesTo(AppScope::class)
-@Module
+@BindingContainer
 interface AnalyticsModule {
     @Binds
     fun bindAnalyticsPreferencesPresenter(presenter: AnalyticsPreferencesPresenter): Presenter<AnalyticsPreferencesState>

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenter.kt

@@ -10,6 +10,7 @@ package io.element.android.features.analytics.impl.preferences
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.rememberCoroutineScope
+import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.AnalyticsConfig
 import io.element.android.features.analytics.api.AnalyticsOptInEvents
 import io.element.android.features.analytics.api.preferences.AnalyticsPreferencesState
@@ -18,9 +19,9 @@ import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
-class AnalyticsPreferencesPresenter @Inject constructor(
+@Inject
+class AnalyticsPreferencesPresenter(
     private val analyticsService: AnalyticsService,
     private val buildMeta: BuildMeta,
 ) : Presenter<AnalyticsPreferencesState> {

features/cachecleaner/api/build.gradle.kts

@@ -1,4 +1,4 @@
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2023, 2024 New Vector Ltd.
@@ -15,7 +15,7 @@ android {
     namespace = "io.element.android.features.cachecleaner.api"
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     implementation(projects.libraries.architecture)

features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerBindings.kt

@@ -7,8 +7,8 @@
 
 package io.element.android.features.cachecleaner.api
 
-import com.squareup.anvil.annotations.ContributesTo
+import dev.zacsweers.metro.AppScope
-import io.element.android.libraries.di.AppScope
+import dev.zacsweers.metro.ContributesTo
 
 @ContributesTo(AppScope::class)
 interface CacheCleanerBindings {

features/cachecleaner/impl/build.gradle.kts

@@ -1,4 +1,4 @@
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2023, 2024 New Vector Ltd.
@@ -15,7 +15,7 @@ android {
     namespace = "io.element.android.features.cachecleaner.impl"
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     api(projects.features.cachecleaner.api)

features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/DefaultCacheCleaner.kt

@@ -7,24 +7,25 @@
 
 package io.element.android.features.cachecleaner.impl
 
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.cachecleaner.api.CacheCleaner
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.extensions.runCatchingExceptions
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.CacheDirectory
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.io.File
-import javax.inject.Inject
 
 /**
  * Default implementation of [CacheCleaner].
  */
 @ContributesBinding(AppScope::class)
-class DefaultCacheCleaner @Inject constructor(
+@Inject
+class DefaultCacheCleaner(
     @AppCoroutineScope
     private val coroutineScope: CoroutineScope,
     private val dispatchers: CoroutineDispatchers,

features/call/impl/build.gradle.kts

@@ -1,6 +1,6 @@
 import extension.buildConfigFieldStr
 import extension.readLocalProperty
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2024 New Vector Ltd.
@@ -60,7 +60,7 @@ android {
     }
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     implementation(projects.appconfig)

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/DefaultElementCallEntryPoint.kt

@@ -8,20 +8,21 @@
 package io.element.android.features.call.impl
 
 import android.content.Context
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.call.api.CallType
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.utils.ActiveCallManager
 import io.element.android.features.call.impl.utils.IntentProvider
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.annotations.ApplicationContext
-import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
-import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class DefaultElementCallEntryPoint @Inject constructor(
+@Inject
+class DefaultElementCallEntryPoint(
     @ApplicationContext private val context: Context,
     private val activeCallManager: ActiveCallManager,
 ) : ElementCallEntryPoint {

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/di/CallBindings.kt

@@ -7,11 +7,11 @@
 
 package io.element.android.features.call.impl.di
 
-import com.squareup.anvil.annotations.ContributesTo
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesTo
 import io.element.android.features.call.impl.receivers.DeclineCallBroadcastReceiver
 import io.element.android.features.call.impl.ui.ElementCallActivity
 import io.element.android.features.call.impl.ui.IncomingCallActivity
-import io.element.android.libraries.di.AppScope
 
 @ContributesTo(AppScope::class)
 interface CallBindings {

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/notifications/RingingCallNotificationCreator.kt

@@ -15,13 +15,14 @@ import android.provider.Settings
 import androidx.core.app.NotificationCompat
 import androidx.core.app.PendingIntentCompat
 import androidx.core.app.Person
+import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.ElementCallConfig
 import io.element.android.features.call.api.CallType
 import io.element.android.features.call.impl.receivers.DeclineCallBroadcastReceiver
 import io.element.android.features.call.impl.ui.IncomingCallActivity
 import io.element.android.features.call.impl.utils.IntentProvider
 import io.element.android.libraries.designsystem.utils.CommonDrawables
-import io.element.android.libraries.di.ApplicationContext
+import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -29,13 +30,13 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 import io.element.android.libraries.push.api.notifications.NotificationBitmapLoader
-import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 
 /**
  * Creates a notification for a ringing call.
  */
-class RingingCallNotificationCreator @Inject constructor(
+@Inject
+class RingingCallNotificationCreator(
     @ApplicationContext private val context: Context,
     private val matrixClientProvider: MatrixClientProvider,
     private val imageLoaderHolder: ImageLoaderHolder,

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenter.kt

@@ -13,16 +13,17 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
 import io.element.android.features.call.impl.utils.PipController
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.log.logger.LoggerTag
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 private val loggerTag = LoggerTag("PiP")
 
-class PictureInPicturePresenter @Inject constructor(
+@Inject
+class PictureInPicturePresenter(
     pipSupportProvider: PipSupportProvider,
 ) : Presenter<PictureInPictureState> {
     private val isPipSupported = pipSupportProvider.isPipSupported()

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipSupportProvider.kt

@@ -11,11 +11,11 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.annotation.ChecksSdkIntAtLeast
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.bool.orFalse
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.annotations.ApplicationContext
-import io.element.android.libraries.di.ApplicationContext
-import javax.inject.Inject
 
 interface PipSupportProvider {
     @ChecksSdkIntAtLeast(Build.VERSION_CODES.O)
@@ -23,7 +23,8 @@ interface PipSupportProvider {
 }
 
 @ContributesBinding(AppScope::class)
-class DefaultPipSupportProvider @Inject constructor(
+@Inject
+class DefaultPipSupportProvider(
     @ApplicationContext private val context: Context,
 ) : PipSupportProvider {
     override fun isPipSupported(): Boolean {

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/receivers/DeclineCallBroadcastReceiver.kt

@@ -11,6 +11,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import androidx.core.content.IntentCompat
+import dev.zacsweers.metro.Inject
 import io.element.android.features.call.api.CallType
 import io.element.android.features.call.impl.di.CallBindings
 import io.element.android.features.call.impl.notifications.CallNotificationData
@@ -19,7 +20,6 @@ import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 /**
  * Broadcast receiver to decline the incoming call.

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt

@@ -17,9 +17,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedFactory
+import dev.zacsweers.metro.AssistedFactory
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.call.api.CallType
@@ -49,7 +49,8 @@ import timber.log.Timber
 import java.util.UUID
 import kotlin.time.Duration.Companion.seconds
 
-class CallScreenPresenter @AssistedInject constructor(
+@Inject
+class CallScreenPresenter(
     @Assisted private val callType: CallType,
     @Assisted private val navigator: CallScreenNavigator,
     private val callWidgetProvider: CallWidgetProvider,

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt

@@ -30,6 +30,7 @@ import androidx.core.app.PictureInPictureModeChangedInfo
 import androidx.core.content.IntentCompat
 import androidx.core.util.Consumer
 import androidx.lifecycle.Lifecycle
+import dev.zacsweers.metro.Inject
 import io.element.android.features.call.api.CallType
 import io.element.android.features.call.api.CallType.ExternalUrl
 import io.element.android.features.call.impl.DefaultElementCallEntryPoint
@@ -50,7 +51,6 @@ import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import timber.log.Timber
-import javax.inject.Inject
 
 private val loggerTag = LoggerTag("ElementCallActivity")
 
@@ -79,7 +79,7 @@ class ElementCallActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        applicationContext.bindings<CallBindings>().inject(this)
+        bindings<CallBindings>().inject(this)
 
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt

@@ -13,6 +13,7 @@ import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.IntentCompat
 import androidx.lifecycle.lifecycleScope
+import dev.zacsweers.metro.Inject
 import io.element.android.features.call.api.CallType
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.call.impl.di.CallBindings
@@ -30,7 +31,6 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 /**
  * Activity that's displayed as a full screen intent when an incoming call is received.
@@ -64,7 +64,7 @@ class IncomingCallActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        applicationContext.bindings<CallBindings>().inject(this)
+        bindings<CallBindings>().inject(this)
 
         // Set flags so it can be displayed in the lock screen
         @Suppress("DEPRECATION")

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/LanguageTagProvider.kt

@@ -9,9 +9,9 @@ package io.element.android.features.call.impl.ui
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalConfiguration
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
-import io.element.android.libraries.di.AppScope
+import dev.zacsweers.metro.ContributesBinding
-import javax.inject.Inject
+import dev.zacsweers.metro.Inject
 
 interface LanguageTagProvider {
     @Composable
@@ -19,7 +19,8 @@ interface LanguageTagProvider {
 }
 
 @ContributesBinding(AppScope::class)
-class DefaultLanguageTagProvider @Inject constructor() : LanguageTagProvider {
+@Inject
+class DefaultLanguageTagProvider : LanguageTagProvider {
     @Composable
     override fun provideLanguageTag(): String? {
         return LocalConfiguration.current.locales.get(0)?.toLanguageTag()

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt

@@ -15,17 +15,18 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.getSystemService
 import coil3.SingletonImageLoader
 import coil3.annotation.DelicateCoilApi
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.ElementCallConfig
 import io.element.android.features.call.api.CallType
 import io.element.android.features.call.api.CurrentCall
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.notifications.RingingCallNotificationCreator
 import io.element.android.libraries.core.extensions.runCatchingExceptions
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.ApplicationContext
-import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
@@ -52,7 +53,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
-import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 
 /**
@@ -86,7 +86,8 @@ interface ActiveCallManager {
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-class DefaultActiveCallManager @Inject constructor(
+@Inject
+class DefaultActiveCallManager(
     @ApplicationContext context: Context,
     @AppCoroutineScope
     private val coroutineScope: CoroutineScope,

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallIntentDataParser.kt

@@ -9,9 +9,10 @@ package io.element.android.features.call.impl.utils
 
 import android.net.Uri
 import androidx.core.net.toUri
-import javax.inject.Inject
+import dev.zacsweers.metro.Inject
 
-class CallIntentDataParser @Inject constructor() {
+@Inject
+class CallIntentDataParser {
     private val validHttpSchemes = sequenceOf("https")
     private val knownHosts = sequenceOf(
         "call.element.io",

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallAnalyticCredentialsProvider.kt

@@ -7,14 +7,15 @@
 
 package io.element.android.features.call.impl.utils
 
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.call.impl.BuildConfig
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.widget.CallAnalyticCredentialsProvider
-import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class DefaultCallAnalyticCredentialsProvider @Inject constructor() : CallAnalyticCredentialsProvider {
+@Inject
+class DefaultCallAnalyticCredentialsProvider : CallAnalyticCredentialsProvider {
     override val posthogUserId: String? = BuildConfig.POSTHOG_USER_ID.takeIf { it.isNotBlank() }
     override val posthogApiHost: String? = BuildConfig.POSTHOG_API_HOST.takeIf { it.isNotBlank() }
     override val posthogApiKey: String? = BuildConfig.POSTHOG_API_KEY.takeIf { it.isNotBlank() }

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt

@@ -7,9 +7,10 @@
 
 package io.element.android.features.call.impl.utils
 
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.runCatchingExceptions
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -18,12 +19,12 @@ import io.element.android.libraries.matrix.api.widget.CallWidgetSettingsProvider
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
 import kotlinx.coroutines.flow.firstOrNull
-import javax.inject.Inject
 
 private const val EMBEDDED_CALL_WIDGET_BASE_URL = "https://appassets.androidplatform.net/element-call/index.html"
 
 @ContributesBinding(AppScope::class)
-class DefaultCallWidgetProvider @Inject constructor(
+@Inject
+class DefaultCallWidgetProvider(
     private val matrixClientsProvider: MatrixClientProvider,
     private val appPreferencesStore: AppPreferencesStore,
     private val callWidgetSettingsProvider: CallWidgetSettingsProvider,

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCurrentCallService.kt

@@ -7,17 +7,18 @@
 
 package io.element.android.features.call.impl.utils
 
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import io.element.android.features.call.api.CurrentCall
 import io.element.android.features.call.api.CurrentCallService
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.SingleIn
 import kotlinx.coroutines.flow.MutableStateFlow
-import javax.inject.Inject
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-class DefaultCurrentCallService @Inject constructor() : CurrentCallService {
+@Inject
+class DefaultCurrentCallService : CurrentCallService {
     override val currentCall = MutableStateFlow<CurrentCall>(CurrentCall.None)
 
     fun onCallStarted(call: CurrentCall) {

features/changeroommemberroles/impl/build.gradle.kts

@@ -1,4 +1,4 @@
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2025 New Vector Ltd.
@@ -22,7 +22,7 @@ android {
     }
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     api(projects.features.changeroommemberroles.api)

features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNode.kt

@@ -14,8 +14,8 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.architecture.NodeInputs
@@ -26,7 +26,8 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import kotlinx.coroutines.flow.first
 
 @ContributesNode(RoomScope::class)
-class ChangeRolesNode @AssistedInject constructor(
+@Inject
+class ChangeRolesNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     presenterFactory: ChangeRolesPresenter.Factory,

features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesPresenter.kt

@@ -18,9 +18,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedFactory
+import dev.zacsweers.metro.AssistedFactory
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.RoomModeration
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
@@ -47,7 +47,8 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 
-class ChangeRolesPresenter @AssistedInject constructor(
+@Inject
+class ChangeRolesPresenter(
     @Assisted private val role: RoomMember.Role,
     private val room: JoinedRoom,
     private val dispatchers: CoroutineDispatchers,

features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRoomMemberRolesRootNode.kt

@@ -16,8 +16,8 @@ import com.bumble.appyx.core.navigation.model.permanent.PermanentNavModel
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.plugin.Plugin
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appnav.di.RoomComponentFactory
 import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
@@ -25,14 +25,15 @@ import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRole
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(SessionScope::class)
-class ChangeRoomMemberRolesRootNode @AssistedInject constructor(
+@Inject
+class ChangeRoomMemberRolesRootNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     roomComponentFactory: RoomComponentFactory,
@@ -43,7 +44,7 @@ class ChangeRoomMemberRolesRootNode @AssistedInject constructor(
     ),
     buildContext = buildContext,
     plugins = plugins,
-), DaggerComponentOwner, ChangeRoomMemberRolesEntryPoint.NodeProxy {
+), DependencyInjectionGraphOwner, ChangeRoomMemberRolesEntryPoint.NodeProxy {
     sealed interface NavTarget : Parcelable {
         @Parcelize
         object Root : NavTarget
@@ -56,7 +57,7 @@ class ChangeRoomMemberRolesRootNode @AssistedInject constructor(
 
     private val inputs = inputs<Inputs>()
 
-    override val daggerComponent = roomComponentFactory.create(inputs.joinedRoom)
+    override val graph = roomComponentFactory.create(inputs.joinedRoom)
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {

features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPoint.kt

@@ -9,16 +9,17 @@ package io.element.android.features.changeroommemberroles.impl
 
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
 import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import javax.inject.Inject
 
 @ContributesBinding(SessionScope::class)
-class DefaultChangeRoomMemberRolesEntyPoint @Inject constructor() : ChangeRoomMemberRolesEntryPoint {
+@Inject
+class DefaultChangeRoomMemberRolesEntyPoint : ChangeRoomMemberRolesEntryPoint {
     override fun builder(parentNode: Node, buildContext: BuildContext): ChangeRoomMemberRolesEntryPoint.Builder {
         return object : ChangeRoomMemberRolesEntryPoint.Builder {
             private lateinit var changeRoomMemberRolesListType: ChangeRoomMemberRolesListType

features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/RoomMemberListDataSource.kt

@@ -7,15 +7,16 @@
 
 package io.element.android.features.changeroommemberroles.impl
 
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.roomMembers
 import kotlinx.coroutines.withContext
-import javax.inject.Inject
 
-class RoomMemberListDataSource @Inject constructor(
+@Inject
+class RoomMemberListDataSource(
     private val room: BaseRoom,
     private val coroutineDispatchers: CoroutineDispatchers,
 ) {

features/createroom/impl/build.gradle.kts

@@ -1,4 +1,4 @@
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2022-2024 New Vector Ltd.
@@ -22,7 +22,7 @@ android {
     }
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     implementation(projects.libraries.core)

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt

@@ -16,8 +16,8 @@ import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.replace
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.createroom.api.CreateRoomEntryPoint
 import io.element.android.features.createroom.impl.addpeople.AddPeopleNode
@@ -30,7 +30,8 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(SessionScope::class)
-class CreateRoomFlowNode @AssistedInject constructor(
+@Inject
+class CreateRoomFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
 ) : BaseFlowNode<CreateRoomFlowNode.NavTarget>(

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt

@@ -10,14 +10,15 @@ package io.element.android.features.createroom.impl
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.createroom.api.CreateRoomEntryPoint
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
-import javax.inject.Inject
 
 @ContributesBinding(SessionScope::class)
-class DefaultCreateRoomEntryPoint @Inject constructor() : CreateRoomEntryPoint {
+@Inject
+class DefaultCreateRoomEntryPoint : CreateRoomEntryPoint {
     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): CreateRoomEntryPoint.NodeBuilder {
         val plugins = ArrayList<Plugin>()
 

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt

@@ -13,8 +13,8 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.invitepeople.api.InvitePeoplePresenter
 import io.element.android.features.invitepeople.api.InvitePeopleRenderer
@@ -24,7 +24,8 @@ import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 
 @ContributesNode(SessionScope::class)
-class AddPeopleNode @AssistedInject constructor(
+@Inject
+class AddPeopleNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     invitePeoplePresenterFactory: InvitePeoplePresenter.Factory,

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt

@@ -14,8 +14,8 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.di.SessionScope
@@ -23,7 +23,8 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.services.analytics.api.AnalyticsService
 
 @ContributesNode(SessionScope::class)
-class ConfigureRoomNode @AssistedInject constructor(
+@Inject
+class ConfigureRoomNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val presenter: ConfigureRoomPresenter,

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt

@@ -17,6 +17,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.CreatedRoom
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
@@ -44,10 +45,10 @@ import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 import kotlin.jvm.optionals.getOrDefault
 
-class ConfigureRoomPresenter @Inject constructor(
+@Inject
+class ConfigureRoomPresenter(
     private val dataStore: CreateRoomConfigStore,
     private val matrixClient: MatrixClient,
     private val mediaPickerProvider: PickerProvider,

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfigStore.kt

@@ -8,15 +8,16 @@
 package io.element.android.features.createroom.impl.configureroom
 
 import android.net.Uri
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.file.safeDelete
 import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.getAndUpdate
 import java.io.File
-import javax.inject.Inject
 
-class CreateRoomConfigStore @Inject constructor(
+@Inject
+class CreateRoomConfigStore(
     private val roomAliasHelper: RoomAliasHelper,
 ) {
     private val createRoomConfigFlow: MutableStateFlow<CreateRoomConfig> = MutableStateFlow(CreateRoomConfig())

features/deactivation/impl/build.gradle.kts

@@ -1,4 +1,4 @@
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2024 New Vector Ltd.
@@ -22,7 +22,7 @@ android {
     }
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     implementation(projects.libraries.androidutils)

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationNode.kt

@@ -12,13 +12,14 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
-class AccountDeactivationNode @AssistedInject constructor(
+@Inject
+class AccountDeactivationNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val presenter: AccountDeactivationPresenter,

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenter.kt

@@ -12,15 +12,16 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.matrix.api.MatrixClient
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
-class AccountDeactivationPresenter @Inject constructor(
+@Inject
+class AccountDeactivationPresenter(
     private val matrixClient: MatrixClient,
 ) : Presenter<AccountDeactivationState> {
     @Composable

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPoint.kt

@@ -9,14 +9,15 @@ package io.element.android.features.logout.impl
 
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.deactivation.api.AccountDeactivationEntryPoint
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.AppScope
-import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class DefaultAccountDeactivationEntryPoint @Inject constructor() : AccountDeactivationEntryPoint {
+@Inject
+class DefaultAccountDeactivationEntryPoint : AccountDeactivationEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<AccountDeactivationNode>(buildContext)
     }

features/enterprise/impl-foss/build.gradle.kts

@@ -1,4 +1,4 @@
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2024 New Vector Ltd.
@@ -14,7 +14,7 @@ android {
     namespace = "io.element.android.features.enterprise.impl"
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     implementation(libs.compound)

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt

@@ -7,19 +7,20 @@
 
 package io.element.android.features.enterprise.impl
 
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.compound.tokens.generated.SemanticColors
 import io.element.android.compound.tokens.generated.compoundColorsDark
 import io.element.android.compound.tokens.generated.compoundColorsLight
 import io.element.android.features.enterprise.api.BugReportUrl
 import io.element.android.features.enterprise.api.EnterpriseService
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.coroutines.flow.flowOf
-import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class DefaultEnterpriseService @Inject constructor() : EnterpriseService {
+@Inject
+class DefaultEnterpriseService : EnterpriseService {
     override val isEnterpriseBuild = false
 
     override suspend fun isEnterpriseUser(sessionId: SessionId) = false

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt

@@ -7,13 +7,14 @@
 
 package io.element.android.features.enterprise.impl
 
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.libraries.di.SessionScope
-import javax.inject.Inject
 
 @ContributesBinding(SessionScope::class)
-class DefaultSessionEnterpriseService @Inject constructor() : SessionEnterpriseService {
+@Inject
+class DefaultSessionEnterpriseService : SessionEnterpriseService {
     override suspend fun init() = Unit
     override suspend fun isElementCallAvailable(): Boolean = true
 }

features/ftue/impl/build.gradle.kts

@@ -1,4 +1,4 @@
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2023, 2024 New Vector Ltd.
@@ -22,7 +22,7 @@ android {
     }
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     api(projects.features.ftue.api)

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt

@@ -10,14 +10,15 @@ package io.element.android.features.ftue.impl
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.ftue.api.FtueEntryPoint
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.AppScope
-import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class DefaultFtueEntryPoint @Inject constructor() : FtueEntryPoint {
+@Inject
+class DefaultFtueEntryPoint : FtueEntryPoint {
     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): FtueEntryPoint.NodeBuilder {
         val plugins = ArrayList<Plugin>()
 

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt

@@ -21,8 +21,9 @@ import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import com.bumble.appyx.navmodel.backstack.operation.replace
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.AppScope
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.analytics.api.AnalyticsEntryPoint
 import io.element.android.features.ftue.impl.notifications.NotificationsOptInNode
@@ -34,7 +35,6 @@ import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.SessionScope
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -45,7 +45,8 @@ import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(SessionScope::class)
-class FtueFlowNode @AssistedInject constructor(
+@Inject
+class FtueFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val ftueState: DefaultFtueService,
@@ -157,17 +158,18 @@ class FtueFlowNode @AssistedInject constructor(
     override fun View(modifier: Modifier) {
         BackstackView()
     }
+}
 
-    @ContributesNode(AppScope::class)
+@ContributesNode(AppScope::class)
-    class PlaceholderNode @AssistedInject constructor(
+@Inject
-        @Assisted buildContext: BuildContext,
+class PlaceholderNode(
-        @Assisted plugins: List<Plugin>,
+    @Assisted buildContext: BuildContext,
-    ) : Node(buildContext, plugins = plugins) {
+    @Assisted plugins: List<Plugin>,
-        @Composable
+) : Node(buildContext, plugins = plugins) {
-        override fun View(modifier: Modifier) {
+    @Composable
-            Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+    override fun View(modifier: Modifier) {
-                CircularProgressIndicator()
+        Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            }
+            CircularProgressIndicator()
         }
     }
 }

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/di/FtueModule.kt

@@ -7,16 +7,16 @@
 
 package io.element.android.features.ftue.impl.di
 
-import com.squareup.anvil.annotations.ContributesTo
+import dev.zacsweers.metro.BindingContainer
-import dagger.Binds
+import dev.zacsweers.metro.Binds
-import dagger.Module
+import dev.zacsweers.metro.ContributesTo
 import io.element.android.features.ftue.impl.sessionverification.choosemode.ChooseSelfVerificationModePresenter
 import io.element.android.features.ftue.impl.sessionverification.choosemode.ChooseSelfVerificationModeState
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.di.SessionScope
 
 @ContributesTo(SessionScope::class)
-@Module
+@BindingContainer
 interface FtueModule {
     @Binds
     fun bindChooseSelfVerificationMethodPresenter(presenter: ChooseSelfVerificationModePresenter): Presenter<ChooseSelfVerificationModeState>

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInNode.kt

@@ -12,15 +12,16 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.AppScope
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.AppScope
 
 @ContributesNode(AppScope::class)
-class NotificationsOptInNode @AssistedInject constructor(
+@Inject
+class NotificationsOptInNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     presenterFactory: NotificationsOptInPresenter.Factory,

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt

@@ -12,9 +12,9 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedFactory
+import dev.zacsweers.metro.AssistedFactory
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.permissions.api.PermissionStateProvider
@@ -25,7 +25,8 @@ import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
-class NotificationsOptInPresenter @AssistedInject constructor(
+@Inject
+class NotificationsOptInPresenter(
     permissionsPresenterFactory: PermissionsPresenter.Factory,
     @Assisted private val callback: NotificationsOptInNode.Callback,
     @AppCoroutineScope

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt

@@ -20,8 +20,8 @@ import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appconfig.LearnMoreConfig
 import io.element.android.features.ftue.impl.sessionverification.choosemode.ChooseSelfVerificationModeNode
@@ -37,7 +37,8 @@ import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(SessionScope::class)
-class FtueSessionVerificationFlowNode @AssistedInject constructor(
+@Inject
+class FtueSessionVerificationFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val outgoingVerificationEntryPoint: OutgoingVerificationEntryPoint,

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeNode.kt

@@ -13,15 +13,16 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.logout.api.direct.DirectLogoutView
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
-class ChooseSelfVerificationModeNode @AssistedInject constructor(
+@Inject
+class ChooseSelfVerificationModeNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val presenter: Presenter<ChooseSelfVerificationModeState>,

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt

@@ -12,14 +12,15 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import dev.zacsweers.metro.Inject
 import io.element.android.features.logout.api.direct.DirectLogoutEvents
 import io.element.android.features.logout.api.direct.DirectLogoutState
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.RecoveryState
-import javax.inject.Inject
 
-class ChooseSelfVerificationModePresenter @Inject constructor(
+@Inject
+class ChooseSelfVerificationModePresenter(
     private val encryptionService: EncryptionService,
     private val directLogoutPresenter: Presenter<DirectLogoutState>,
 ) : Presenter<ChooseSelfVerificationModeState> {

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueService.kt

@@ -10,12 +10,13 @@ package io.element.android.features.ftue.impl.state
 import android.Manifest
 import android.os.Build
 import androidx.annotation.VisibleForTesting
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import io.element.android.features.ftue.api.state.FtueService
 import io.element.android.features.ftue.api.state.FtueState
 import io.element.android.features.lockscreen.api.LockScreenService
 import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
@@ -31,11 +32,11 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
-import javax.inject.Inject
 
 @ContributesBinding(SessionScope::class)
 @SingleIn(SessionScope::class)
-class DefaultFtueService @Inject constructor(
+@Inject
+class DefaultFtueService(
     private val sdkVersionProvider: BuildVersionSdkIntProvider,
     @SessionCoroutineScope sessionCoroutineScope: CoroutineScope,
     private val analyticsService: AnalyticsService,

features/home/impl/build.gradle.kts

@@ -1,4 +1,4 @@
-import extension.setupAnvil
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2022-2024 New Vector Ltd.
@@ -22,7 +22,7 @@ android {
     }
 }
 
-setupAnvil()
+setupDependencyInjection()
 
 dependencies {
     implementation(projects.appconfig)

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt

@@ -10,14 +10,15 @@ package io.element.android.features.home.impl
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.home.api.HomeEntryPoint
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.AppScope
-import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
-class DefaultHomeEntryPoint @Inject constructor() : HomeEntryPoint {
+@Inject
+class DefaultHomeEntryPoint : HomeEntryPoint {
     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): HomeEntryPoint.NodeBuilder {
         val plugins = ArrayList<Plugin>()
 

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt

@@ -25,8 +25,8 @@ import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
-import dagger.assisted.Assisted
+import dev.zacsweers.metro.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
@@ -56,7 +56,8 @@ import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(SessionScope::class)
-class HomeFlowNode @AssistedInject constructor(
+@Inject
+class HomeFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val matrixClient: MatrixClient,

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomePresenter.kt

@@ -16,6 +16,7 @@ import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
 import io.element.android.features.home.impl.roomlist.RoomListState
 import io.element.android.features.logout.api.direct.DirectLogoutState
 import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
@@ -27,9 +28,9 @@ import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.indicator.api.IndicatorService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.sync.SyncService
-import javax.inject.Inject
 
-class HomePresenter @Inject constructor(
+@Inject
+class HomePresenter(
     private val client: MatrixClient,
     private val syncService: SyncService,
     private val snackbarDispatcher: SnackbarDispatcher,