Skip to content

Commit cd1bda0

Browse files
renovate[bot]jmartinesp
authored and
andybalaam
committed
Update metro to v0.6.7 (#5416)
* Update metro to v0.6.7 * Replace `@Inject` with `@AssistedInject` where needed --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín <[email protected]>
1 parent 217b3ff commit cd1bda0

File tree

177 files changed

+352
-350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+352
-350
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import com.bumble.appyx.core.plugin.Plugin
2424
import com.bumble.appyx.core.plugin.plugins
2525
import dev.zacsweers.metro.AppScope
2626
import dev.zacsweers.metro.Assisted
27-
import dev.zacsweers.metro.Inject
27+
import dev.zacsweers.metro.AssistedInject
2828
import io.element.android.annotations.ContributesNode
2929
import io.element.android.appnav.di.SessionGraphFactory
3030
import io.element.android.libraries.architecture.NodeInputs
@@ -41,7 +41,7 @@ import kotlinx.parcelize.Parcelize
4141
* This allow to inject objects with SessionScope in the constructor of [LoggedInFlowNode].
4242
*/
4343
@ContributesNode(AppScope::class)
44-
@Inject
44+
@AssistedInject
4545
class LoggedInAppScopeFlowNode(
4646
@Assisted buildContext: BuildContext,
4747
@Assisted plugins: List<Plugin>,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import com.bumble.appyx.navmodel.backstack.operation.replace
3838
import com.bumble.appyx.navmodel.backstack.operation.singleTop
3939
import dev.zacsweers.metro.AppScope
4040
import dev.zacsweers.metro.Assisted
41+
import dev.zacsweers.metro.AssistedInject
4142
import dev.zacsweers.metro.Inject
4243
import im.vector.app.features.analytics.plan.JoinedRoom
4344
import io.element.android.annotations.ContributesNode
@@ -100,7 +101,7 @@ import kotlin.time.Duration.Companion.seconds
100101
import kotlin.time.toKotlinDuration
101102

102103
@ContributesNode(SessionScope::class)
103-
@Inject
104+
@AssistedInject
104105
class LoggedInFlowNode(
105106
@Assisted buildContext: BuildContext,
106107
@Assisted plugins: List<Plugin>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import com.bumble.appyx.core.plugin.plugins
2222
import com.bumble.appyx.navmodel.backstack.BackStack
2323
import dev.zacsweers.metro.AppScope
2424
import dev.zacsweers.metro.Assisted
25-
import dev.zacsweers.metro.Inject
25+
import dev.zacsweers.metro.AssistedInject
2626
import io.element.android.annotations.ContributesNode
2727
import io.element.android.features.login.api.LoginEntryPoint
2828
import io.element.android.features.login.api.LoginParams
@@ -36,7 +36,7 @@ import io.element.android.libraries.matrix.ui.media.NotLoggedInImageLoaderFactor
3636
import kotlinx.parcelize.Parcelize
3737

3838
@ContributesNode(AppScope::class)
39-
@Inject
39+
@AssistedInject
4040
class NotLoggedInFlowNode(
4141
@Assisted buildContext: BuildContext,
4242
@Assisted plugins: List<Plugin>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.bumble.appyx.navmodel.backstack.operation.pop
2525
import com.bumble.appyx.navmodel.backstack.operation.push
2626
import dev.zacsweers.metro.AppScope
2727
import dev.zacsweers.metro.Assisted
28-
import dev.zacsweers.metro.Inject
28+
import dev.zacsweers.metro.AssistedInject
2929
import im.vector.app.features.analytics.plan.JoinedRoom
3030
import io.element.android.annotations.ContributesNode
3131
import io.element.android.appnav.di.MatrixSessionCache
@@ -60,7 +60,7 @@ import kotlinx.parcelize.Parcelize
6060
import timber.log.Timber
6161

6262
@ContributesNode(AppScope::class)
63-
@Inject
63+
@AssistedInject
6464
class RootFlowNode(
6565
@Assisted val buildContext: BuildContext,
6666
@Assisted plugins: List<Plugin>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package io.element.android.appnav.di
1010
import androidx.annotation.VisibleForTesting
1111
import dev.zacsweers.metro.Assisted
1212
import dev.zacsweers.metro.AssistedFactory
13-
import dev.zacsweers.metro.Inject
13+
import dev.zacsweers.metro.AssistedInject
1414
import io.element.android.features.networkmonitor.api.NetworkMonitor
1515
import io.element.android.features.networkmonitor.api.NetworkStatus
1616
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicBoolean
3030
import kotlin.time.Duration.Companion.milliseconds
3131
import kotlin.time.Duration.Companion.seconds
3232

33-
@Inject
33+
@AssistedInject
3434
class SyncOrchestrator(
3535
@Assisted matrixClient: MatrixClient,
3636
private val appForegroundStateService: AppForegroundStateService,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import com.bumble.appyx.core.node.Node
1414
import com.bumble.appyx.core.plugin.Plugin
1515
import com.bumble.appyx.core.plugin.plugins
1616
import dev.zacsweers.metro.Assisted
17-
import dev.zacsweers.metro.Inject
17+
import dev.zacsweers.metro.AssistedInject
1818
import io.element.android.annotations.ContributesNode
1919
import io.element.android.libraries.di.SessionScope
2020

2121
@ContributesNode(SessionScope::class)
22-
@Inject
22+
@AssistedInject
2323
class LoggedInNode(
2424
@Assisted buildContext: BuildContext,
2525
@Assisted plugins: List<Plugin>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import com.bumble.appyx.core.plugin.plugins
2222
import com.bumble.appyx.navmodel.backstack.BackStack
2323
import com.bumble.appyx.navmodel.backstack.operation.newRoot
2424
import dev.zacsweers.metro.Assisted
25-
import dev.zacsweers.metro.Inject
25+
import dev.zacsweers.metro.AssistedInject
2626
import im.vector.app.features.analytics.plan.JoinedRoom
2727
import io.element.android.annotations.ContributesNode
2828
import io.element.android.appnav.room.joined.JoinedRoomFlowNode
@@ -64,7 +64,7 @@ import java.util.Optional
6464
import kotlin.jvm.optionals.getOrNull
6565

6666
@ContributesNode(SessionScope::class)
67-
@Inject
67+
@AssistedInject
6868
class RoomFlowNode(
6969
@Assisted val buildContext: BuildContext,
7070
@Assisted plugins: List<Plugin>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.bumble.appyx.core.plugin.plugins
2525
import com.bumble.appyx.navmodel.backstack.BackStack
2626
import com.bumble.appyx.navmodel.backstack.operation.newRoot
2727
import dev.zacsweers.metro.Assisted
28-
import dev.zacsweers.metro.Inject
28+
import dev.zacsweers.metro.AssistedInject
2929
import io.element.android.annotations.ContributesNode
3030
import io.element.android.appnav.room.RoomNavigationTarget
3131
import io.element.android.libraries.architecture.BackstackView
@@ -45,7 +45,7 @@ import kotlinx.coroutines.flow.onEach
4545
import kotlinx.parcelize.Parcelize
4646

4747
@ContributesNode(SessionScope::class)
48-
@Inject
48+
@AssistedInject
4949
class JoinedRoomFlowNode(
5050
@Assisted val buildContext: BuildContext,
5151
@Assisted plugins: List<Plugin>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import com.bumble.appyx.core.plugin.Plugin
1818
import com.bumble.appyx.navmodel.backstack.BackStack
1919
import com.bumble.appyx.navmodel.backstack.operation.push
2020
import dev.zacsweers.metro.Assisted
21-
import dev.zacsweers.metro.Inject
21+
import dev.zacsweers.metro.AssistedInject
2222
import io.element.android.annotations.ContributesNode
2323
import io.element.android.appnav.di.RoomComponentFactory
2424
import io.element.android.appnav.room.RoomNavigationTarget
@@ -45,7 +45,7 @@ import kotlinx.parcelize.Parcelize
4545
import timber.log.Timber
4646

4747
@ContributesNode(SessionScope::class)
48-
@Inject
48+
@AssistedInject
4949
class JoinedRoomLoadedFlowNode(
5050
@Assisted buildContext: BuildContext,
5151
@Assisted plugins: List<Plugin>,

‎codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class ContributesNodeProcessor(
118118
val assistedParameters = constructor.parameters.filter { it.isAnnotationPresent(Assisted::class) }
119119
if (assistedParameters.size != 2) {
120120
error(
121-
"${ksClass.qualifiedName?.asString()} must have an @Inject constructor with 2 @Assisted parameters. Found: ${assistedParameters.size}",
121+
"${ksClass.qualifiedName?.asString()} must have a constructor with 2 @Assisted parameters. Found: ${assistedParameters.size}",
122122
)
123123
}
124124
val contextAssistedParam = assistedParameters[0]

0 commit comments

Comments
 (0)