Tidy up the package structure.

compose-tooling/api/compose-tooling.api

@@ -6,8 +6,8 @@ public final class com/squareup/workflow/ui/compose/tooling/BuildConfig {
 }
 
 public final class com/squareup/workflow/ui/compose/tooling/ComposeWorkflowsKt {
-	public static final fun preview (Lcom/squareup/workflow/compose/ComposeWorkflow;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/ui/core/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;)V
-	public static synthetic fun preview$default (Lcom/squareup/workflow/compose/ComposeWorkflow;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/ui/core/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;ILjava/lang/Object;)V
+	public static final fun preview (Lcom/squareup/workflow/ui/compose/ComposeWorkflow;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/ui/core/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;)V
+	public static synthetic fun preview$default (Lcom/squareup/workflow/ui/compose/ComposeWorkflow;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/ui/core/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;ILjava/lang/Object;)V
 }
 
 public final class com/squareup/workflow/ui/compose/tooling/ViewFactoriesKt {

compose-tooling/src/androidTest/java/com/squareup/workflow/ui/compose/tooling/PreviewComposeWorkflowTest.kt

@@ -31,7 +31,7 @@ import androidx.ui.test.findByText
 import androidx.ui.tooling.preview.Preview
 import androidx.ui.unit.dp
 import com.squareup.workflow.Workflow
-import com.squareup.workflow.compose.composed
+import com.squareup.workflow.ui.compose.composed
 import com.squareup.workflow.ui.ViewEnvironmentKey
 import com.squareup.workflow.ui.compose.showRendering
 import org.junit.Rule

compose-tooling/src/main/java/com/squareup/workflow/ui/compose/tooling/ComposeWorkflows.kt

@@ -21,7 +21,7 @@ import androidx.compose.Composable
 import androidx.ui.core.Modifier
 import androidx.ui.foundation.Box
 import com.squareup.workflow.Sink
-import com.squareup.workflow.compose.ComposeWorkflow
+import com.squareup.workflow.ui.compose.ComposeWorkflow
 import com.squareup.workflow.ui.ViewEnvironment
 import com.squareup.workflow.ui.ViewFactory
 import com.squareup.workflow.ui.ViewRegistry

core-compose/api/core-compose.api

@@ -1,26 +1,12 @@
-public final class com/squareup/workflow/compose/ComposeRendering {
-	public static final field Companion Lcom/squareup/workflow/compose/ComposeRendering$Companion;
+public final class com/squareup/workflow/ui/compose/ComposeRendering {
+	public static final field Companion Lcom/squareup/workflow/ui/compose/ComposeRendering$Companion;
 	public static final fun <clinit> ()V
 	public fun <init> (Lkotlin/jvm/functions/Function2;)V
 }
 
-public final class com/squareup/workflow/compose/ComposeRendering$Companion {
+public final class com/squareup/workflow/ui/compose/ComposeRendering$Companion {
 	public final fun getFactory ()Lcom/squareup/workflow/ui/ViewFactory;
-	public final fun getNoopRendering ()Lcom/squareup/workflow/compose/ComposeRendering;
-}
-
-public abstract class com/squareup/workflow/compose/ComposeWorkflow : com/squareup/workflow/Workflow {
-	public fun <init> ()V
-	public fun asStatefulWorkflow ()Lcom/squareup/workflow/StatefulWorkflow;
-	public abstract fun render (Ljava/lang/Object;Lcom/squareup/workflow/Sink;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/compose/Composer;)V
-}
-
-public final class com/squareup/workflow/compose/ComposeWorkflowKt {
-	public static final fun composed (Lcom/squareup/workflow/Workflow$Companion;Lkotlin/jvm/functions/Function4;)Lcom/squareup/workflow/compose/ComposeWorkflow;
-}
-
-public final class com/squareup/workflow/ui/compose/ComposeSupportKt {
-	public static final fun <clinit> ()V
+	public final fun getNoopRendering ()Lcom/squareup/workflow/ui/compose/ComposeRendering;
 }
 
 public final class com/squareup/workflow/ui/compose/ComposeViewFactory : com/squareup/workflow/ui/ViewFactory {
@@ -46,6 +32,16 @@ public final class com/squareup/workflow/ui/compose/ComposeViewFactoryRootKt {
 	public static final fun withComposeViewFactoryRoot (Lcom/squareup/workflow/ui/ViewEnvironment;Lkotlin/jvm/functions/Function2;)Lcom/squareup/workflow/ui/ViewEnvironment;
 }
 
+public abstract class com/squareup/workflow/ui/compose/ComposeWorkflow : com/squareup/workflow/Workflow {
+	public fun <init> ()V
+	public fun asStatefulWorkflow ()Lcom/squareup/workflow/StatefulWorkflow;
+	public abstract fun render (Ljava/lang/Object;Lcom/squareup/workflow/Sink;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/compose/Composer;)V
+}
+
+public final class com/squareup/workflow/ui/compose/ComposeWorkflowKt {
+	public static final fun composed (Lcom/squareup/workflow/Workflow$Companion;Lkotlin/jvm/functions/Function4;)Lcom/squareup/workflow/ui/compose/ComposeWorkflow;
+}
+
 public final class com/squareup/workflow/ui/compose/ViewEnvironmentsKt {
 	public static final fun showRendering (Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/compose/Composer;)V
 	public static synthetic fun showRendering$default (Lcom/squareup/workflow/ui/ViewEnvironment;Ljava/lang/Object;Landroidx/ui/core/Modifier;Landroidx/compose/Composer;ILjava/lang/Object;)V
@@ -70,6 +66,10 @@ public final class com/squareup/workflow/ui/compose/WorkflowContainerKt {
 	public static synthetic fun WorkflowContainer$default (Lcom/squareup/workflow/Workflow;Lkotlin/jvm/functions/Function1;Landroidx/ui/core/Modifier;Lcom/squareup/workflow/diagnostic/WorkflowDiagnosticListener;Lkotlin/jvm/functions/Function2;Landroidx/compose/Composer;ILjava/lang/Object;)V
 }
 
+public final class com/squareup/workflow/ui/compose/internal/ComposeSupportKt {
+	public static final fun <clinit> ()V
+}
+
 public final class com/squareup/workflow/ui/core/compose/BuildConfig {
 	public static final field BUILD_TYPE Ljava/lang/String;
 	public static final field DEBUG Z

core-compose/src/androidTest/java/com/squareup/workflow/ui/compose/ComposeViewFactoryRootTest.kt

@@ -23,6 +23,7 @@ import androidx.ui.test.assertIsDisplayed
 import androidx.ui.test.createComposeRule
 import androidx.ui.test.findByText
 import com.google.common.truth.Truth.assertThat
+import com.squareup.workflow.ui.compose.internal.SafeComposeViewFactoryRoot
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

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

@@ -15,14 +15,13 @@
  */
 @file:Suppress("RemoveEmptyParenthesesFromAnnotationEntry")
 
-package com.squareup.workflow.compose
+package com.squareup.workflow.ui.compose
 
 import androidx.compose.Composable
-import com.squareup.workflow.compose.ComposeRendering.Companion.Factory
-import com.squareup.workflow.compose.ComposeRendering.Companion.NoopRendering
+import com.squareup.workflow.ui.compose.ComposeRendering.Companion.Factory
+import com.squareup.workflow.ui.compose.ComposeRendering.Companion.NoopRendering
 import com.squareup.workflow.ui.ViewEnvironment
 import com.squareup.workflow.ui.ViewFactory
-import com.squareup.workflow.ui.compose.bindCompose
 
 /**
  * A workflow rendering that renders itself using a [Composable] function.

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

@@ -31,6 +31,9 @@ import androidx.ui.core.setContent
 import com.squareup.workflow.ui.ViewEnvironment
 import com.squareup.workflow.ui.ViewFactory
 import com.squareup.workflow.ui.bindShowRendering
+import com.squareup.workflow.ui.compose.internal.CompositionContinuation
+import com.squareup.workflow.ui.compose.internal.SafeComposeViewFactoryRoot
+import com.squareup.workflow.ui.compose.internal.setContent
 import kotlin.reflect.KClass
 
 /**

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

@@ -15,13 +15,14 @@
  */
 @file:Suppress("RemoveEmptyParenthesesFromAnnotationEntry")
 
-package com.squareup.workflow.compose
+package com.squareup.workflow.ui.compose
 
 import androidx.compose.Composable
 import com.squareup.workflow.Sink
 import com.squareup.workflow.StatefulWorkflow
 import com.squareup.workflow.Workflow
 import com.squareup.workflow.ui.ViewEnvironment
+import com.squareup.workflow.ui.compose.internal.ComposeWorkflowImpl
 
 /**
  * A stateless [Workflow][com.squareup.workflow.Workflow] that [renders][render] itself as

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

@@ -20,6 +20,7 @@ import androidx.compose.remember
 import androidx.ui.core.Modifier
 import com.squareup.workflow.ui.ViewEnvironment
 import com.squareup.workflow.ui.ViewRegistry
+import com.squareup.workflow.ui.compose.internal.showRendering
 
 /**
  * Renders [rendering] into the composition using this [ViewEnvironment]'s

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

@@ -40,7 +40,6 @@ import androidx.ui.savedinstancestate.UiSavedStateRegistryAmbient
 import androidx.ui.savedinstancestate.savedInstanceState
 import com.squareup.workflow.Snapshot
 import com.squareup.workflow.Workflow
-import com.squareup.workflow.compose.ComposeRendering
 import com.squareup.workflow.diagnostic.WorkflowDiagnosticListener
 import com.squareup.workflow.launchWorkflowIn
 import com.squareup.workflow.ui.ViewEnvironment

core-compose/src/main/java/com/squareup/workflow/ui/compose/ComposeSupport.kt → core-compose/src/main/java/com/squareup/workflow/ui/compose/internal/ComposeSupport.kt

@@ -15,7 +15,7 @@
  */
 @file:Suppress("RemoveEmptyParenthesesFromAnnotationEntry")
 
-package com.squareup.workflow.ui.compose
+package com.squareup.workflow.ui.compose.internal
 
 import android.content.Context
 import android.view.View
@@ -27,11 +27,11 @@ import androidx.compose.Recomposer
 import androidx.compose.compositionFor
 import androidx.lifecycle.LifecycleOwner
 import androidx.ui.node.UiComposer
-import com.squareup.workflow.ui.compose.ReflectionSupport.ANDROID_OWNER_CLASS
-import com.squareup.workflow.ui.compose.ReflectionSupport.androidOwnerView
-import com.squareup.workflow.ui.compose.ReflectionSupport.createOwner
-import com.squareup.workflow.ui.compose.ReflectionSupport.createWrappedContent
-import com.squareup.workflow.ui.compose.ReflectionSupport.ownerRoot
+import com.squareup.workflow.ui.compose.internal.ReflectionSupport.ANDROID_OWNER_CLASS
+import com.squareup.workflow.ui.compose.internal.ReflectionSupport.androidOwnerView
+import com.squareup.workflow.ui.compose.internal.ReflectionSupport.createOwner
+import com.squareup.workflow.ui.compose.internal.ReflectionSupport.createWrappedContent
+import com.squareup.workflow.ui.compose.internal.ReflectionSupport.ownerRoot
 import com.squareup.workflow.ui.core.compose.R
 
 private typealias AndroidOwner = Any

core-compose/src/main/java/com/squareup/workflow/compose/ComposeWorkflowImpl.kt → core-compose/src/main/java/com/squareup/workflow/ui/compose/internal/ComposeWorkflowImpl.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.workflow.compose
+package com.squareup.workflow.ui.compose.internal
 
 import androidx.compose.MutableState
 import androidx.compose.StructurallyEqual
@@ -23,8 +23,10 @@ import com.squareup.workflow.Sink
 import com.squareup.workflow.Snapshot
 import com.squareup.workflow.StatefulWorkflow
 import com.squareup.workflow.action
-import com.squareup.workflow.compose.ComposeWorkflowImpl.State
+import com.squareup.workflow.ui.compose.internal.ComposeWorkflowImpl.State
 import com.squareup.workflow.contraMap
+import com.squareup.workflow.ui.compose.ComposeRendering
+import com.squareup.workflow.ui.compose.ComposeWorkflow
 
 internal class ComposeWorkflowImpl<PropsT, OutputT : Any>(
   private val workflow: ComposeWorkflow<PropsT, OutputT>

core-compose/src/main/java/com/squareup/workflow/ui/compose/CompositionContinuation.kt → core-compose/src/main/java/com/squareup/workflow/ui/compose/internal/CompositionContinuation.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.workflow.ui.compose
+package com.squareup.workflow.ui.compose.internal
 
 import androidx.compose.Composable
 import androidx.compose.CompositionReference

core-compose/src/main/java/com/squareup/workflow/ui/compose/SafeComposeViewFactoryRoot.kt → core-compose/src/main/java/com/squareup/workflow/ui/compose/internal/SafeComposeViewFactoryRoot.kt

@@ -15,9 +15,10 @@
  */
 @file:Suppress("RemoveEmptyParenthesesFromAnnotationEntry")
 
-package com.squareup.workflow.ui.compose
+package com.squareup.workflow.ui.compose.internal
 
 import androidx.compose.Composable
+import com.squareup.workflow.ui.compose.ComposeViewFactoryRoot
 
 /**
  * [ComposeViewFactoryRoot] that asserts that the [wrap] method invokes its children parameter

core-compose/src/main/java/com/squareup/workflow/ui/compose/ViewFactories.kt → core-compose/src/main/java/com/squareup/workflow/ui/compose/internal/ViewFactories.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.workflow.ui.compose
+package com.squareup.workflow.ui.compose.internal
 
 import android.content.Context
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
@@ -24,7 +24,8 @@ import androidx.ui.foundation.Box
 import com.squareup.workflow.ui.ViewEnvironment
 import com.squareup.workflow.ui.ViewFactory
 import com.squareup.workflow.ui.WorkflowViewStub
-import com.squareup.workflow.ui.compose.ComposableViewStubWrapper.Update
+import com.squareup.workflow.ui.compose.ComposeViewFactory
+import com.squareup.workflow.ui.compose.internal.ComposableViewStubWrapper.Update
 
 /**
  * Renders [rendering] into the composition using the `ViewRegistry` from the [ViewEnvironment] to

core-compose/src/main/java/com/squareup/workflow/ui/compose/ViewRegistries.kt → core-compose/src/main/java/com/squareup/workflow/ui/compose/internal/ViewRegistries.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.workflow.ui.compose
+package com.squareup.workflow.ui.compose.internal
 
 import androidx.compose.Composable
 import androidx.compose.remember

samples/hello-compose-rendering/src/main/java/com/squareup/sample/hellocomposerendering/HelloComposeRenderingActivity.kt

@@ -17,7 +17,7 @@ package com.squareup.sample.hellocomposerendering
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.squareup.workflow.compose.ComposeRendering
+import com.squareup.workflow.ui.compose.ComposeRendering
 import com.squareup.workflow.diagnostic.SimpleLoggingDiagnosticListener
 import com.squareup.workflow.ui.ViewRegistry
 import com.squareup.workflow.ui.WorkflowRunner

samples/hello-compose-rendering/src/main/java/com/squareup/sample/hellocomposerendering/HelloRenderingWorkflow.kt

@@ -27,7 +27,7 @@ import androidx.ui.material.ripple.ripple
 import androidx.ui.tooling.preview.Preview
 import com.squareup.sample.hellocomposerendering.HelloRenderingWorkflow.Toggle
 import com.squareup.workflow.Sink
-import com.squareup.workflow.compose.ComposeWorkflow
+import com.squareup.workflow.ui.compose.ComposeWorkflow
 import com.squareup.workflow.ui.ViewEnvironment
 import com.squareup.workflow.ui.compose.tooling.preview
 

samples/hello-compose-rendering/src/main/java/com/squareup/sample/hellocomposerendering/HelloWorkflow.kt

@@ -22,7 +22,7 @@ import com.squareup.workflow.RenderContext
 import com.squareup.workflow.Snapshot
 import com.squareup.workflow.StatefulWorkflow
 import com.squareup.workflow.action
-import com.squareup.workflow.compose.ComposeRendering
+import com.squareup.workflow.ui.compose.ComposeRendering
 import com.squareup.workflow.parse
 
 object HelloWorkflow : StatefulWorkflow<Unit, State, Nothing, ComposeRendering>() {