Some cleanup:

- Remove unnecessary `GlobalScope`.
- Rename `Component` to `Graph`, `DaggerComponentOwner` to `DependencyInjectionGraphOwner`.
- Rename component builders to factories, where necessary.

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

@@ -25,7 +25,7 @@ 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
@@ -44,7 +44,7 @@ class ChangeRoomMemberRolesRootNode(
     ),
     buildContext = buildContext,
     plugins = plugins,
-), DaggerComponentOwner, ChangeRoomMemberRolesEntryPoint.NodeProxy {
+), DependencyInjectionGraphOwner, ChangeRoomMemberRolesEntryPoint.NodeProxy {
     sealed interface NavTarget : Parcelable {
         @Parcelize
         object Root : NavTarget
@@ -57,7 +57,7 @@ class ChangeRoomMemberRolesRootNode(
 
     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/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginGraph.kt

@@ -13,10 +13,10 @@ import dev.zacsweers.metro.GraphExtension
 import io.element.android.libraries.architecture.NodeFactoriesBindings
 
 @GraphExtension(QrCodeLoginScope::class)
-interface QrCodeLoginComponent : NodeFactoriesBindings {
+interface QrCodeLoginGraph : NodeFactoriesBindings {
     @ContributesTo(AppScope::class)
     @GraphExtension.Factory
     interface Factory {
-        fun create(): QrCodeLoginComponent
+        fun create(): QrCodeLoginGraph
     }
 }

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNode.kt

@@ -26,7 +26,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.Inject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.login.impl.di.QrCodeLoginBindings
-import io.element.android.features.login.impl.di.QrCodeLoginComponent
+import io.element.android.features.login.impl.di.QrCodeLoginGraph
 import io.element.android.features.login.impl.screens.qrcode.confirmation.QrCodeConfirmationNode
 import io.element.android.features.login.impl.screens.qrcode.confirmation.QrCodeConfirmationStep
 import io.element.android.features.login.impl.screens.qrcode.error.QrCodeErrorNode
@@ -38,7 +38,7 @@ import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
 import io.element.android.libraries.matrix.api.auth.qrlogin.QrCodeLoginStep
 import io.element.android.libraries.matrix.api.auth.qrlogin.QrLoginException
@@ -53,7 +53,7 @@ import timber.log.Timber
 class QrCodeLoginFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    qrCodeLoginComponentBuilder: QrCodeLoginComponent.Factory,
+    qrCodeLoginGraphFactory: QrCodeLoginGraph.Factory,
     private val coroutineDispatchers: CoroutineDispatchers,
 ) : BaseFlowNode<QrCodeLoginFlowNode.NavTarget>(
     backstack = BackStack(
@@ -62,10 +62,10 @@ class QrCodeLoginFlowNode(
     ),
     buildContext = buildContext,
     plugins = plugins,
-), DaggerComponentOwner {
+), DependencyInjectionGraphOwner {
     private var authenticationJob: Job? = null
 
-    override val daggerComponent = qrCodeLoginComponentBuilder.create()
+    override val graph = qrCodeLoginGraphFactory.create()
     private val qrCodeLoginManager by lazy { bindings<QrCodeLoginBindings>().qrCodeLoginManager() }
 
     sealed interface NavTarget : Parcelable {

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeMergedQrCodeLoginComponent.kt

@@ -1,40 +0,0 @@
-/*
- * Copyright 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.features.login.impl.di
-
-import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
-import io.element.android.features.login.impl.qrcode.FakeQrCodeLoginManager
-import io.element.android.features.login.impl.qrcode.QrCodeLoginFlowNode
-import io.element.android.features.login.impl.qrcode.QrCodeLoginManager
-import io.element.android.libraries.architecture.AssistedNodeFactory
-import io.element.android.libraries.architecture.createNode
-
-internal class FakeMergedQrCodeLoginComponent(private val qrCodeLoginManager: QrCodeLoginManager) :
-    MergedQrCodeLoginComponent {
-    // Ignore this error, it does override a method once code generation is done
-    override fun qrCodeLoginManager(): QrCodeLoginManager = qrCodeLoginManager
-
-    class Builder(private val qrCodeLoginManager: QrCodeLoginManager = FakeQrCodeLoginManager()) :
-        QrCodeLoginComponent.Factory {
-        override fun create(): QrCodeLoginComponent {
-            return FakeMergedQrCodeLoginComponent(qrCodeLoginManager)
-        }
-    }
-
-    override fun nodeFactories(): Map<Class<out Node>, AssistedNodeFactory<*>> {
-        return mapOf(
-            QrCodeLoginFlowNode::class.java to object : AssistedNodeFactory<QrCodeLoginFlowNode> {
-                override fun create(buildContext: BuildContext, plugins: List<Plugin>): QrCodeLoginFlowNode {
-                    return createNode<QrCodeLoginFlowNode>(buildContext, plugins)
-                }
-            }
-        )
-    }
-}

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeQrCodeLoginGraph.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright 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.features.login.impl.di
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import io.element.android.features.login.impl.qrcode.FakeQrCodeLoginManager
+import io.element.android.features.login.impl.qrcode.QrCodeLoginFlowNode
+import io.element.android.features.login.impl.qrcode.QrCodeLoginManager
+import io.element.android.libraries.architecture.AssistedNodeFactory
+import io.element.android.libraries.architecture.createNode
+
+internal class FakeQrCodeLoginGraph(
+    private val qrCodeLoginManager: QrCodeLoginManager,
+) : QrCodeLoginGraph, QrCodeLoginBindings {
+    override fun nodeFactories(): Map<KClass<out Node>, AssistedNodeFactory<*>> {
+        return mapOf(
+            QrCodeLoginFlowNode::class to object : AssistedNodeFactory<QrCodeLoginFlowNode> {
+                override fun create(buildContext: BuildContext, plugins: List<Plugin>): QrCodeLoginFlowNode {
+                    return createNode<QrCodeLoginFlowNode>(buildContext, plugins)
+                }
+            }
+        )
+    }
+
+    override fun qrCodeLoginManager(): QrCodeLoginManager = qrCodeLoginManager
+
+    internal class Builder(
+        private val qrCodeLoginManager: QrCodeLoginManager,
+    ) : QrCodeLoginComponent.Factory {
+        override fun create(): QrCodeLoginComponent {
+            return FakeQrCodeLoginComponent(qrCodeLoginManager)
+        }
+    }
+}

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNodeTest.kt

@@ -12,7 +12,7 @@ import com.bumble.appyx.core.modality.AncestryInfo
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.utils.customisations.NodeCustomisationDirectoryImpl
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.login.impl.di.FakeMergedQrCodeLoginComponent
+import io.element.android.features.login.impl.di.FakeQrCodeLoginGraph
 import io.element.android.features.login.impl.screens.qrcode.confirmation.QrCodeConfirmationStep
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.auth.qrlogin.QrCodeLoginStep
@@ -183,7 +183,7 @@ class QrCodeLoginFlowNodeTest {
         return QrCodeLoginFlowNode(
             buildContext = buildContext,
             plugins = emptyList(),
-            qrCodeLoginComponentBuilder = FakeMergedQrCodeLoginComponent.Builder(qrCodeLoginManager),
+            qrCodeLoginGraphFactory = FakeQrCodeLoginGraph.Builder(qrCodeLoginManager),
             coroutineDispatchers = coroutineDispatchers,
         )
     }