Revert "Merge pull request #1370 from square/zachklipp/runtime-android"

This reverts commit fc9e379, reversing
changes made to f4e1297.

Author: zach-klippenstein

artifacts.json

@@ -71,15 +71,6 @@
     "javaVersion": 8,
     "publicationName": "kotlinMultiplatform"
   },
-  {
-    "gradlePath": ":workflow-runtime",
-    "group": "com.squareup.workflow1",
-    "artifactId": "workflow-runtime-android",
-    "description": "Workflow Runtime",
-    "packaging": "aar",
-    "javaVersion": 8,
-    "publicationName": "android"
-  },
   {
     "gradlePath": ":workflow-runtime",
     "group": "com.squareup.workflow1",
@@ -134,6 +125,15 @@
     "javaVersion": 8,
     "publicationName": "kotlinMultiplatform"
   },
+  {
+    "gradlePath": ":workflow-runtime-android",
+    "group": "com.squareup.workflow1",
+    "artifactId": "workflow-runtime-android",
+    "description": "Workflow Runtime Android",
+    "packaging": "aar",
+    "javaVersion": 8,
+    "publicationName": "maven"
+  },
   {
     "gradlePath": ":workflow-rx2",
     "group": "com.squareup.workflow1",

settings.gradle.kts

@@ -64,6 +64,7 @@ include(
   ":workflow-config:config-jvm",
   ":workflow-core",
   ":workflow-runtime",
+  ":workflow-runtime-android",
   ":workflow-rx2",
   ":workflow-testing",
   ":workflow-tracing",

workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt

@@ -1,66 +1,10 @@
-androidx.activity:activity-ktx:1.7.0
-androidx.activity:activity:1.7.0
-androidx.annotation:annotation-experimental:1.4.1
-androidx.annotation:annotation-jvm:1.8.1
-androidx.annotation:annotation:1.8.1
-androidx.arch.core:core-common:2.2.0
-androidx.arch.core:core-runtime:2.2.0
-androidx.autofill:autofill:1.0.0
-androidx.collection:collection-jvm:1.4.4
-androidx.collection:collection-ktx:1.4.4
-androidx.collection:collection:1.4.4
-androidx.compose.runtime:runtime-android:1.7.2
-androidx.compose.runtime:runtime-saveable-android:1.7.2
-androidx.compose.runtime:runtime-saveable:1.7.2
-androidx.compose.runtime:runtime:1.7.2
-androidx.compose.ui:ui-android:1.7.2
-androidx.compose.ui:ui-geometry-android:1.7.2
-androidx.compose.ui:ui-geometry:1.7.2
-androidx.compose.ui:ui-graphics-android:1.7.2
-androidx.compose.ui:ui-graphics:1.7.2
-androidx.compose.ui:ui-text-android:1.7.2
-androidx.compose.ui:ui-text:1.7.2
-androidx.compose.ui:ui-unit-android:1.7.2
-androidx.compose.ui:ui-unit:1.7.2
-androidx.compose.ui:ui-util-android:1.7.2
-androidx.compose.ui:ui-util:1.7.2
-androidx.compose:compose-bom:2024.09.02
-androidx.concurrent:concurrent-futures:1.1.0
-androidx.core:core-ktx:1.12.0
-androidx.core:core:1.12.0
-androidx.customview:customview-poolingcontainer:1.0.0
-androidx.emoji2:emoji2:1.2.0
-androidx.graphics:graphics-path:1.0.1
-androidx.interpolator:interpolator:1.0.0
-androidx.lifecycle:lifecycle-common-jvm:2.8.7
-androidx.lifecycle:lifecycle-common:2.8.7
-androidx.lifecycle:lifecycle-livedata-core:2.8.7
-androidx.lifecycle:lifecycle-process:2.8.7
-androidx.lifecycle:lifecycle-runtime-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-compose:2.8.7
-androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
-androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
-androidx.lifecycle:lifecycle-runtime:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
-androidx.lifecycle:lifecycle-viewmodel:2.8.7
-androidx.profileinstaller:profileinstaller:1.3.1
-androidx.savedstate:savedstate-ktx:1.2.1
-androidx.savedstate:savedstate:1.2.1
-androidx.startup:startup-runtime:1.1.1
-androidx.tracing:tracing:1.0.0
-androidx.versionedparcelable:versionedparcelable:1.1.1
-com.google.guava:listenablefuture:1.0
 com.squareup.okio:okio-jvm:3.3.0
 com.squareup.okio:okio:3.3.0
 org.jetbrains.kotlin:kotlin-bom:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3

workflow-runtime-android/README.md

@@ -0,0 +1,11 @@
+# Module Workflow Runtime Android
+
+This module is an Android library that contains utilities to start a Workflow runtime that are
+specific to Android components. This contains only the 'headless' components for Workflow on
+Android; i.e. no UI concerns.
+
+See :workflow-ui:core-android for the complimentary helpers on Android that include UI concerns:
+view model persistent, `WorkflowLayout`, etc.
+
+It also provides a place to include tests that verify behaviour of the runtime while using
+Android specific dispatchers.

workflow-runtime-android/api/workflow-runtime-android.api

@@ -0,0 +1,10 @@
+public final class com/squareup/workflow1/android/AndroidRenderWorkflowKt {
+	public static final fun removeWorkflowState (Landroidx/lifecycle/SavedStateHandle;)V
+	public static final fun renderWorkflowIn (Lcom/squareup/workflow1/Workflow;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/SavedStateHandle;Ljava/util/List;Ljava/util/Set;Lcom/squareup/workflow1/WorkflowTracer;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/StateFlow;
+	public static final fun renderWorkflowIn (Lcom/squareup/workflow1/Workflow;Lkotlinx/coroutines/CoroutineScope;Ljava/lang/Object;Landroidx/lifecycle/SavedStateHandle;Ljava/util/List;Ljava/util/Set;Lcom/squareup/workflow1/WorkflowTracer;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/StateFlow;
+	public static final fun renderWorkflowIn (Lcom/squareup/workflow1/Workflow;Lkotlinx/coroutines/CoroutineScope;Lkotlinx/coroutines/flow/StateFlow;Landroidx/lifecycle/SavedStateHandle;Ljava/util/List;Ljava/util/Set;Lcom/squareup/workflow1/WorkflowTracer;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/StateFlow;
+	public static synthetic fun renderWorkflowIn$default (Lcom/squareup/workflow1/Workflow;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/SavedStateHandle;Ljava/util/List;Ljava/util/Set;Lcom/squareup/workflow1/WorkflowTracer;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/flow/StateFlow;
+	public static synthetic fun renderWorkflowIn$default (Lcom/squareup/workflow1/Workflow;Lkotlinx/coroutines/CoroutineScope;Ljava/lang/Object;Landroidx/lifecycle/SavedStateHandle;Ljava/util/List;Ljava/util/Set;Lcom/squareup/workflow1/WorkflowTracer;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/flow/StateFlow;
+	public static synthetic fun renderWorkflowIn$default (Lcom/squareup/workflow1/Workflow;Lkotlinx/coroutines/CoroutineScope;Lkotlinx/coroutines/flow/StateFlow;Landroidx/lifecycle/SavedStateHandle;Ljava/util/List;Ljava/util/Set;Lcom/squareup/workflow1/WorkflowTracer;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/flow/StateFlow;
+}
+

workflow-runtime-android/build.gradle.kts

@@ -0,0 +1,35 @@
+plugins {
+  id("com.android.library")
+  id("kotlin-android")
+  id("android-defaults")
+  id("android-ui-tests")
+  id("app.cash.burst")
+  id("published")
+}
+
+android {
+  namespace = "com.squareup.workflow1.android"
+  testNamespace = "$namespace.test"
+}
+
+dependencies {
+  val composeBom = platform(libs.androidx.compose.bom)
+
+  api(project(":workflow-runtime"))
+  api(libs.androidx.compose.ui.android)
+  api(libs.androidx.lifecycle.viewmodel.savedstate)
+
+  implementation(composeBom)
+  implementation(project(":workflow-core"))
+
+  androidTestImplementation(libs.androidx.activity.ktx)
+  androidTestImplementation(libs.androidx.lifecycle.viewmodel.ktx)
+  androidTestImplementation(libs.androidx.test.core)
+  androidTestImplementation(libs.androidx.test.truth)
+  androidTestImplementation(libs.kotlin.test.core)
+  androidTestImplementation(libs.kotlin.test.jdk)
+  androidTestImplementation(libs.kotlinx.coroutines.android)
+  androidTestImplementation(libs.kotlinx.coroutines.core)
+  androidTestImplementation(libs.kotlinx.coroutines.test)
+  androidTestImplementation(libs.squareup.papa)
+}

workflow-runtime/dependencies/androidRuntimeClasspath.txt renamed to workflow-runtime-android/dependencies/releaseRuntimeClasspath.txt

@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=workflow-runtime-android
+POM_NAME=Workflow Runtime Android
+POM_PACKAGING=aar