diff --git a/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwnerTest.kt b/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwnerTest.kt index 6561d0724..6915d3ef5 100644 --- a/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwnerTest.kt +++ b/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwnerTest.kt @@ -57,7 +57,7 @@ class ComposeLifecycleOwnerTest { childLifecycleOwner = rememberChildLifecycleOwner(parentLifecycle) parentLifecycle.currentState = CREATED CompositionLocalProvider( - androidx.lifecycle.compose.LocalLifecycleOwner provides childLifecycleOwner + LocalLifecycleOwner provides childLifecycleOwner ) { // let's assert right away as things are composing, because we want to ensure that // the lifecycle is in the correct state as soon as possible & not just after composition @@ -91,9 +91,9 @@ class ComposeLifecycleOwnerTest { LaunchedEffect(Unit) { seenRecomposition = true } CompositionLocalProvider( if (seenRecomposition) { - androidx.lifecycle.compose.LocalLifecycleOwner provides customParentLifecycleOwner + LocalLifecycleOwner provides customParentLifecycleOwner } else { - androidx.lifecycle.compose.LocalLifecycleOwner provides androidx.lifecycle.compose.LocalLifecycleOwner.current + LocalLifecycleOwner provides LocalLifecycleOwner.current } ) { diff --git a/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/WorkflowRenderingTest.kt b/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/WorkflowRenderingTest.kt index 66fa67619..6c93259f9 100644 --- a/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/WorkflowRenderingTest.kt +++ b/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/WorkflowRenderingTest.kt @@ -48,6 +48,7 @@ import androidx.lifecycle.Lifecycle.State.STARTED import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry +import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.findViewTreeLifecycleOwner import androidx.test.espresso.Espresso.onView import androidx.test.espresso.assertion.ViewAssertions.matches @@ -213,7 +214,7 @@ internal class WorkflowRenderingTest { class LifecycleRecorder : ComposableRendering { @Composable override fun Content() { - val lifecycle = androidx.lifecycle.compose.LocalLifecycleOwner.current.lifecycle + val lifecycle = LocalLifecycleOwner.current.lifecycle DisposableEffect(lifecycle) { lifecycle.addObserver( LifecycleEventObserver { _, event -> @@ -301,7 +302,7 @@ internal class WorkflowRenderingTest { composeRule.setContent { CompositionLocalProvider( - androidx.lifecycle.compose.LocalLifecycleOwner provides parentOwner + LocalLifecycleOwner provides parentOwner ) { env.RootScreen(LifecycleRecorder(states)) } @@ -351,7 +352,7 @@ internal class WorkflowRenderingTest { composeRule.setContent { CompositionLocalProvider( - androidx.lifecycle.compose.LocalLifecycleOwner provides parentOwner + LocalLifecycleOwner provides parentOwner ) { env.RootScreen(LifecycleRecorder(states)) } @@ -542,7 +543,7 @@ internal class WorkflowRenderingTest { private val states: MutableList ) : ComposableRendering { @Composable override fun Content() { - val lifecycle = androidx.lifecycle.compose.LocalLifecycleOwner.current.lifecycle + val lifecycle = LocalLifecycleOwner.current.lifecycle DisposableEffect(lifecycle) { this@LifecycleRecorder.states += lifecycle.currentState lifecycle.addObserver(