WIP Update Compose to dev12.

Author: zach-klippenstein

buildSrc/src/main/java/Dependencies.kt

@@ -19,7 +19,7 @@ import java.util.Locale.US
 import kotlin.reflect.full.declaredMembers
 
 object Versions {
-  const val compose = "0.1.0-dev11"
+  const val compose = "0.1.0-dev12"
   const val kotlin = "1.3.71"
   const val targetSdk = 29
   const val workflow = "0.28.0"

core-compose/src/main/java/com/squareup/workflow/ui/compose/WorkflowContainer.kt

@@ -26,8 +26,8 @@ import androidx.annotation.VisibleForTesting
 import androidx.annotation.VisibleForTesting.PRIVATE
 import androidx.compose.Composable
 import androidx.compose.Direct
-import androidx.compose.Pivotal
 import androidx.compose.State
+import androidx.compose.key
 import androidx.compose.onDispose
 import androidx.compose.remember
 import androidx.compose.state
@@ -275,58 +275,60 @@ import kotlin.coroutines.CoroutineContext
  * the [UiSavedStateRegistryAmbient]. If null, will use the default key based on source location.
  */
 @Composable private fun <PropsT, OutputT : Any, RenderingT> renderAsState(
-  @Pivotal workflow: Workflow<PropsT, OutputT, RenderingT>,
+  workflow: Workflow<PropsT, OutputT, RenderingT>,
   props: PropsT,
   onOutput: (OutputT) -> Unit,
-  @Pivotal coroutineContext: CoroutineContext,
-  @Pivotal diagnosticListener: WorkflowDiagnosticListener?,
+  coroutineContext: CoroutineContext,
+  diagnosticListener: WorkflowDiagnosticListener?,
   snapshotKey: String?
 ): State<RenderingT> {
-  // This can be a StateFlow once coroutines is upgraded to 1.3.6.
-  val propsChannel = remember { Channel<PropsT>(capacity = CONFLATED) }
-  propsChannel.offer(props)
+  key(workflow, coroutineContext, diagnosticListener) {
+    // This can be a StateFlow once coroutines is upgraded to 1.3.6.
+    val propsChannel = remember { Channel<PropsT>(capacity = CONFLATED) }
+    propsChannel.offer(props)
+
+    // Need a mutable holder for onOutput so the outputs subscriber created in the onActive block
+    // will always be able to see the latest value.
+    val outputCallback = remember { OutputCallback(onOutput) }
+    outputCallback.onOutput = onOutput
 
-  // Need a mutable holder for onOutput so the outputs subscriber created in the onActive block
-  // will always be able to see the latest value.
-  val outputCallback = remember { OutputCallback(onOutput) }
-  outputCallback.onOutput = onOutput
+    val renderingState = state<RenderingT?> { null }
+    val snapshotState = savedInstanceState(key = snapshotKey, saver = SnapshotSaver) { null }
 
-  val renderingState = state<RenderingT?> { null }
-  val snapshotState = savedInstanceState(key = snapshotKey, saver = SnapshotSaver) { null }
+    // We can't use onActive/on(Pre)Commit because they won't run their callback until after this
+    // function returns, and we need to run this immediately so we get the rendering synchronously.
+    val workflowScope = remember {
+      val coroutineScope = CoroutineScope(coroutineContext + Dispatchers.Main.immediate)
+      val propsFlow = propsChannel.consumeAsFlow()
+          .distinctUntilChanged()
 
-  // We can't use onActive/on(Pre)Commit because they won't run their callback until after this
-  // function returns, and we need to run this immediately so we get the rendering synchronously.
-  val workflowScope = remember {
-    val coroutineScope = CoroutineScope(coroutineContext + Dispatchers.Main.immediate)
-    val propsFlow = propsChannel.consumeAsFlow()
-        .distinctUntilChanged()
+      launchWorkflowIn(coroutineScope, workflow, propsFlow, snapshotState.value) { session ->
+        session.diagnosticListener = diagnosticListener
 
-    launchWorkflowIn(coroutineScope, workflow, propsFlow, snapshotState.value) { session ->
-      session.diagnosticListener = diagnosticListener
+        // Don't call onOutput directly, since out captured reference won't be changed if the
+        // if a different argument is passed to observeWorkflow.
+        session.outputs.onEach { outputCallback.onOutput(it) }
+            .launchIn(this)
 
-      // Don't call onOutput directly, since out captured reference won't be changed if the
-      // if a different argument is passed to observeWorkflow.
-      session.outputs.onEach { outputCallback.onOutput(it) }
-          .launchIn(this)
+        session.renderingsAndSnapshots
+            .onEach { (rendering, snapshot) ->
+              renderingState.value = rendering
+              snapshotState.value = snapshot
+            }
+            .launchIn(this)
+      }
 
-      session.renderingsAndSnapshots
-          .onEach { (rendering, snapshot) ->
-            renderingState.value = rendering
-            snapshotState.value = snapshot
-          }
-          .launchIn(this)
+      return@remember coroutineScope
     }
 
-    return@remember coroutineScope
-  }
+    onDispose {
+      workflowScope.cancel()
+    }
 
-  onDispose {
-    workflowScope.cancel()
+    // The value is guaranteed to be set before returning, so this cast is fine.
+    @Suppress("UNCHECKED_CAST")
+    return renderingState as State<RenderingT>
   }
-
-  // The value is guaranteed to be set before returning, so this cast is fine.
-  @Suppress("UNCHECKED_CAST")
-  return renderingState as State<RenderingT>
 }
 
 private object SnapshotSaver : Saver<Snapshot?, ByteArray> {