Prep Compose 1.10.0

backstack/dependencies/androidReleaseRuntimeClasspath.txt

@@ -12,6 +12,8 @@ androidx.collection:collection
 androidx.compose.runtime:runtime-android
 androidx.compose.runtime:runtime-annotation-android
 androidx.compose.runtime:runtime-annotation
+androidx.compose.runtime:runtime-retain-android
+androidx.compose.runtime:runtime-retain
 androidx.compose.runtime:runtime-saveable-android
 androidx.compose.runtime:runtime-saveable
 androidx.compose.runtime:runtime
@@ -32,12 +34,17 @@ androidx.core:core-ktx
 androidx.core:core-viewtree
 androidx.core:core
 androidx.customview:customview-poolingcontainer
+androidx.documentfile:documentfile
+androidx.dynamicanimation:dynamicanimation
 androidx.emoji2:emoji2
 androidx.graphics:graphics-path
 androidx.interpolator:interpolator
+androidx.legacy:legacy-support-core-utils
 androidx.lifecycle:lifecycle-common-jvm
 androidx.lifecycle:lifecycle-common
+androidx.lifecycle:lifecycle-livedata-core-ktx
 androidx.lifecycle:lifecycle-livedata-core
+androidx.lifecycle:lifecycle-livedata
 androidx.lifecycle:lifecycle-process
 androidx.lifecycle:lifecycle-runtime-android
 androidx.lifecycle:lifecycle-runtime-compose-android
@@ -50,6 +57,9 @@ androidx.lifecycle:lifecycle-viewmodel-ktx
 androidx.lifecycle:lifecycle-viewmodel-savedstate-android
 androidx.lifecycle:lifecycle-viewmodel-savedstate
 androidx.lifecycle:lifecycle-viewmodel
+androidx.loader:loader
+androidx.localbroadcastmanager:localbroadcastmanager
+androidx.print:print
 androidx.profileinstaller:profileinstaller
 androidx.savedstate:savedstate-android
 androidx.savedstate:savedstate-compose-android
@@ -58,7 +68,11 @@ androidx.savedstate:savedstate-ktx
 androidx.savedstate:savedstate
 androidx.startup:startup-runtime
 androidx.tracing:tracing
+androidx.transition:transition
 androidx.versionedparcelable:versionedparcelable
+androidx.window:window-core-android
+androidx.window:window-core
+androidx.window:window
 com.google.guava:listenablefuture
 org.jetbrains.androidx.lifecycle:lifecycle-common
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose

backstack/dependencies/jvmRuntimeClasspath.txt

@@ -6,6 +6,8 @@ androidx.collection:collection
 androidx.compose.runtime:runtime-annotation-jvm
 androidx.compose.runtime:runtime-annotation
 androidx.compose.runtime:runtime-desktop
+androidx.compose.runtime:runtime-retain-desktop
+androidx.compose.runtime:runtime-retain
 androidx.compose.runtime:runtime-saveable-desktop
 androidx.compose.runtime:runtime-saveable
 androidx.compose.runtime:runtime
@@ -19,6 +21,8 @@ androidx.lifecycle:lifecycle-viewmodel-desktop
 androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop
 androidx.lifecycle:lifecycle-viewmodel-savedstate
 androidx.lifecycle:lifecycle-viewmodel
+androidx.navigationevent:navigationevent-desktop
+androidx.navigationevent:navigationevent
 androidx.savedstate:savedstate-compose-desktop
 androidx.savedstate:savedstate-compose
 androidx.savedstate:savedstate-desktop

build.gradle.kts

@@ -54,7 +54,6 @@ plugins {
   alias(libs.plugins.baselineprofile) apply false
   alias(libs.plugins.emulatorWtf) apply false
   alias(libs.plugins.binaryCompatibilityValidator)
-  alias(libs.plugins.compose.hotReload) apply false
 }
 
 val ktfmtVersion = libs.versions.ktfmt.get()
@@ -124,11 +123,10 @@ allprojects {
 }
 
 val jvmTargetVersion = libs.versions.jvmTarget
-val publishedJvmTargetVersion = libs.versions.publishedJvmTarget
 
 subprojects {
   val isPublished = project.hasProperty("POM_ARTIFACT_ID")
-  val jvmTargetProject = if (isPublished) publishedJvmTargetVersion else jvmTargetVersion
+  val jvmTargetProject = jvmTargetVersion
 
   pluginManager.withPlugin("java") {
     configure<JavaPluginExtension> {

circuit-foundation/build.gradle.kts

@@ -67,7 +67,7 @@ kotlin {
         api(projects.circuitRuntimePresenter)
         api(projects.circuitRuntimeUi)
         api(projects.circuitSharedElements)
-        implementation(libs.compose.ui.backhandler)
+        implementation(libs.compose.navigationevent)
       }
     }
     androidMain { dependencies { implementation(libs.androidx.activity.compose) } }

circuit-foundation/dependencies/androidReleaseRuntimeClasspath.txt

@@ -21,6 +21,8 @@ androidx.compose.foundation:foundation
 androidx.compose.runtime:runtime-android
 androidx.compose.runtime:runtime-annotation-android
 androidx.compose.runtime:runtime-annotation
+androidx.compose.runtime:runtime-retain-android
+androidx.compose.runtime:runtime-retain
 androidx.compose.runtime:runtime-saveable-android
 androidx.compose.runtime:runtime-saveable
 androidx.compose.runtime:runtime
@@ -41,12 +43,17 @@ androidx.core:core-ktx
 androidx.core:core-viewtree
 androidx.core:core
 androidx.customview:customview-poolingcontainer
+androidx.documentfile:documentfile
+androidx.dynamicanimation:dynamicanimation
 androidx.emoji2:emoji2
 androidx.graphics:graphics-path
 androidx.interpolator:interpolator
+androidx.legacy:legacy-support-core-utils
 androidx.lifecycle:lifecycle-common-jvm
 androidx.lifecycle:lifecycle-common
+androidx.lifecycle:lifecycle-livedata-core-ktx
 androidx.lifecycle:lifecycle-livedata-core
+androidx.lifecycle:lifecycle-livedata
 androidx.lifecycle:lifecycle-process
 androidx.lifecycle:lifecycle-runtime-android
 androidx.lifecycle:lifecycle-runtime-compose-android
@@ -61,10 +68,13 @@ androidx.lifecycle:lifecycle-viewmodel-ktx
 androidx.lifecycle:lifecycle-viewmodel-savedstate-android
 androidx.lifecycle:lifecycle-viewmodel-savedstate
 androidx.lifecycle:lifecycle-viewmodel
+androidx.loader:loader
+androidx.localbroadcastmanager:localbroadcastmanager
 androidx.navigationevent:navigationevent-android
 androidx.navigationevent:navigationevent-compose-android
 androidx.navigationevent:navigationevent-compose
 androidx.navigationevent:navigationevent
+androidx.print:print
 androidx.profileinstaller:profileinstaller
 androidx.savedstate:savedstate-android
 androidx.savedstate:savedstate-compose-android
@@ -73,14 +83,19 @@ androidx.savedstate:savedstate-ktx
 androidx.savedstate:savedstate
 androidx.startup:startup-runtime
 androidx.tracing:tracing
+androidx.transition:transition
 androidx.versionedparcelable:versionedparcelable
+androidx.window:window-core-android
+androidx.window:window-core
+androidx.window:window
 com.google.guava:listenablefuture
 org.jetbrains.androidx.lifecycle:lifecycle-common
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose
 org.jetbrains.androidx.lifecycle:lifecycle-runtime
 org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose
 org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate
 org.jetbrains.androidx.lifecycle:lifecycle-viewmodel
+org.jetbrains.androidx.navigationevent:navigationevent-compose
 org.jetbrains.androidx.savedstate:savedstate-compose
 org.jetbrains.androidx.savedstate:savedstate
 org.jetbrains.compose.animation:animation-core
@@ -91,8 +106,6 @@ org.jetbrains.compose.foundation:foundation-layout
 org.jetbrains.compose.foundation:foundation
 org.jetbrains.compose.runtime:runtime-saveable
 org.jetbrains.compose.runtime:runtime
-org.jetbrains.compose.ui:ui-backhandler-android
-org.jetbrains.compose.ui:ui-backhandler
 org.jetbrains.compose.ui:ui-geometry
 org.jetbrains.compose.ui:ui-graphics
 org.jetbrains.compose.ui:ui-text

circuit-foundation/dependencies/jvmRuntimeClasspath.txt

@@ -6,6 +6,8 @@ androidx.collection:collection
 androidx.compose.runtime:runtime-annotation-jvm
 androidx.compose.runtime:runtime-annotation
 androidx.compose.runtime:runtime-desktop
+androidx.compose.runtime:runtime-retain-desktop
+androidx.compose.runtime:runtime-retain
 androidx.compose.runtime:runtime-saveable-desktop
 androidx.compose.runtime:runtime-saveable
 androidx.compose.runtime:runtime
@@ -19,6 +21,8 @@ androidx.lifecycle:lifecycle-viewmodel-desktop
 androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop
 androidx.lifecycle:lifecycle-viewmodel-savedstate
 androidx.lifecycle:lifecycle-viewmodel
+androidx.navigationevent:navigationevent-desktop
+androidx.navigationevent:navigationevent
 androidx.savedstate:savedstate-compose-desktop
 androidx.savedstate:savedstate-compose
 androidx.savedstate:savedstate-desktop
@@ -31,6 +35,8 @@ org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose-desktop
 org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose
 org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate
 org.jetbrains.androidx.lifecycle:lifecycle-viewmodel
+org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop
+org.jetbrains.androidx.navigationevent:navigationevent-compose
 org.jetbrains.androidx.savedstate:savedstate-compose-desktop
 org.jetbrains.androidx.savedstate:savedstate-compose
 org.jetbrains.androidx.savedstate:savedstate

circuit-foundation/src/androidUnitTest/kotlin/com/slack/circuit/foundation/NavigatorBackHandlerTest.kt

@@ -6,12 +6,17 @@ import androidx.activity.ComponentActivity
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.backhandler.BackHandler
 import androidx.compose.ui.test.assertTextEquals
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
+import androidx.navigationevent.NavigationEventInfo
+import androidx.navigationevent.compose.NavigationBackHandler
+import androidx.navigationevent.compose.rememberNavigationEventState
 import com.slack.circuit.backstack.rememberSaveableBackStack
 import com.slack.circuit.internal.test.TestContentTags.TAG_GO_NEXT
 import com.slack.circuit.internal.test.TestContentTags.TAG_LABEL
@@ -76,11 +81,13 @@ class NavigatorBackHandlerTest {
   @Test
   fun nestedAndroidNavigatorRootPopBackHandler() {
     val circuit = createTestCircuit(rememberType = TestCountPresenter.RememberType.Standard)
-    var outerBackCount = 0
+    var outerBackCount by mutableStateOf(0)
     lateinit var navigator: Navigator
     composeTestRule.setContent {
       CircuitCompositionLocals(circuit) {
-        BackHandler(enabled = true) { outerBackCount++ }
+        NavigationBackHandler(state = rememberNavigationEventState(NavigationEventInfo.None)) {
+          outerBackCount++
+        }
         val backStack = rememberSaveableBackStack(TestScreen.ScreenA)
         navigator = rememberCircuitNavigator(backStack = backStack)
         NavigableCircuitContent(navigator = navigator, backStack = backStack)
@@ -104,11 +111,13 @@ class NavigatorBackHandlerTest {
   @Test
   fun nestedAndroidNavigatorRootDispatchedBackHandler() {
     val circuit = createTestCircuit(rememberType = TestCountPresenter.RememberType.Standard)
-    var outerBackCount = 0
+    var outerBackCount by mutableStateOf(0)
     lateinit var navigator: Navigator
     composeTestRule.setContent {
       CircuitCompositionLocals(circuit) {
-        BackHandler(enabled = true) { outerBackCount++ }
+        NavigationBackHandler(state = rememberNavigationEventState(NavigationEventInfo.None)) {
+          outerBackCount++
+        }
         val backStack = rememberSaveableBackStack(TestScreen.ScreenA)
         navigator = rememberCircuitNavigator(backStack = backStack)
         NavigableCircuitContent(navigator = navigator, backStack = backStack)

circuit-foundation/src/commonMain/kotlin/com/slack/circuit/foundation/NavigableCircuitContent.kt

@@ -26,6 +26,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.currentCompositeKeyHashCode
@@ -445,9 +446,8 @@ public class ContentProviderState<R : Record>(
 private fun <R : Record> createRecordContent(onActive: () -> Unit, onDispose: () -> Unit) =
   movableContentOf<R, ContentProviderState<R>> { record, contentProviderState ->
     with(contentProviderState) {
-      val lifecycle =
-        remember { MutableRecordLifecycle() }
-          .apply { isActive = lastNavigator.backStack.topRecord == record }
+      val lifecycle = remember { MutableRecordLifecycle() }
+      SideEffect { lifecycle.isActive = lastNavigator.backStack.topRecord == record }
       saveableStateHolder.SaveableStateProvider(record.registryKey) {
         // Provides a RetainedStateRegistry that is maintained independently for each record while
         // the record exists in the back stack.

circuit-foundation/src/commonMain/kotlin/com/slack/circuit/foundation/NavigatorImpl.kt

@@ -12,7 +12,9 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshots.Snapshot
 import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.backhandler.BackHandler
+import androidx.navigationevent.NavigationEventInfo
+import androidx.navigationevent.compose.NavigationBackHandler
+import androidx.navigationevent.compose.rememberNavigationEventState
 import com.slack.circuit.backstack.BackStack
 import com.slack.circuit.backstack.BackStack.Record
 import com.slack.circuit.backstack.isAtRoot
@@ -43,7 +45,7 @@ public fun rememberCircuitNavigator(
 
 /**
  * Returns a new [Navigator] for navigating within [CircuitContents][CircuitContent] while also
- * handling back events with a [BackHandler].
+ * handling back events with a [NavigationBackHandler].
  *
  * @param backStack The backing [BackStack] to navigate.
  * @param onRootPop Invoked when the backstack is at root (size 1) and the user presses the back
@@ -74,9 +76,10 @@ public fun rememberCircuitNavigator(
   }
   var hasPendingRootPop by remember(hasScreenChanged) { mutableStateOf(false) }
   var enableRootBackHandler by remember(hasScreenChanged) { mutableStateOf(true) }
-  BackHandler(
-    enabled = enableBackHandler && enableRootBackHandler && backStack.size > 1,
-    onBack = {
+  NavigationBackHandler(
+    state = rememberNavigationEventState(NavigationEventInfo.None),
+    isBackEnabled = enableBackHandler && enableRootBackHandler && backStack.size > 1,
+    onBackCompleted = {
       // We need to unload this BackHandler from the composition before the root pop is triggered so
       // any outer back handler will get called. So delay calling pop until after the next
       // composition.

circuit-foundation/src/commonMain/kotlin/com/slack/circuit/foundation/RetainedStateHolder.kt

@@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.key
 import androidx.compose.runtime.remember
-import com.slack.circuit.foundation.internal.withCompositionLocalProvider
+import androidx.compose.runtime.withCompositionLocal
 import com.slack.circuit.retained.CanRetainChecker
 import com.slack.circuit.retained.LocalRetainedStateRegistry
 import com.slack.circuit.retained.RetainedStateRegistry
@@ -40,24 +40,19 @@ private class RetainedStateHolderImpl(private var canRetainChecker: CanRetainChe
 
   @Composable
   override fun <T> RetainedStateProvider(key: String, content: @Composable (() -> T)): T {
-    return withCompositionLocalProvider(LocalRetainedStateRegistry provides registry) {
+    return withCompositionLocal(LocalRetainedStateRegistry provides registry) {
       key(key) {
         val entryCanRetainChecker = remember { EntryCanRetainChecker() }
         val childRegistry =
           rememberRetainedStateRegistry(key = key, canRetainChecker = entryCanRetainChecker)
-        withCompositionLocalProvider(
-            LocalRetainedStateRegistry provides childRegistry,
-            content = content,
-          )
-          .also {
-            DisposableEffect(Unit) {
-              entryCheckers[key] = entryCanRetainChecker
-              onDispose {
-                registry.saveValue(key)
-                entryCheckers -= key
-              }
-            }
+        DisposableEffect(Unit) {
+          entryCheckers[key] = entryCanRetainChecker
+          onDispose {
+            registry.saveValue(key)
+            entryCheckers -= key
           }
+        }
+        withCompositionLocal(LocalRetainedStateRegistry provides childRegistry, content = content)
       }
     }
   }

circuit-foundation/src/commonMain/kotlin/com/slack/circuit/foundation/SaveableStateHolder.kt

@@ -9,7 +9,7 @@ import androidx.compose.runtime.saveable.LocalSaveableStateRegistry
 import androidx.compose.runtime.saveable.SaveableStateRegistry
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.saveable.rememberSaveable
-import com.slack.circuit.foundation.internal.withCompositionLocalProvider
+import androidx.compose.runtime.withCompositionLocal
 
 /**
  * This is a copy of [androidx.compose.runtime.saveable.SaveableStateHolder], tweaked so that
@@ -53,7 +53,7 @@ private class SaveableStateHolderImpl(
     }
 
     val result =
-      withCompositionLocalProvider(
+      withCompositionLocal(
         LocalSaveableStateRegistry provides registryHolder.registry,
         content = content,
       )