Revert "Merge pull request #1373 from square/zachklipp/snapshotparcels"

This reverts commit 9410118, reversing
changes made to fc9e379.

Author: zach-klippenstein

artifacts.json

@@ -17,15 +17,6 @@
     "javaVersion": 8,
     "publicationName": "maven"
   },
-  {
-    "gradlePath": ":workflow-core",
-    "group": "com.squareup.workflow1",
-    "artifactId": "workflow-core-android",
-    "description": "Workflow Core",
-    "packaging": "aar",
-    "javaVersion": 8,
-    "publicationName": "android"
-  },
   {
     "gradlePath": ":workflow-core",
     "group": "com.squareup.workflow1",

samples/containers/hello-back-button/src/main/java/com/squareup/sample/hellobackbutton/AreYouSureWorkflow.kt

@@ -10,8 +10,6 @@ import com.squareup.workflow1.Snapshot
 import com.squareup.workflow1.StatefulWorkflow
 import com.squareup.workflow1.WorkflowAction.Companion.noAction
 import com.squareup.workflow1.action
-import com.squareup.workflow1.toParcelable
-import com.squareup.workflow1.toSnapshot
 import com.squareup.workflow1.ui.AndroidScreen
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.ScreenViewFactory
@@ -24,6 +22,8 @@ import com.squareup.workflow1.ui.navigation.AlertOverlay.Event.ButtonClicked
 import com.squareup.workflow1.ui.navigation.AlertOverlay.Event.Canceled
 import com.squareup.workflow1.ui.navigation.BackButtonScreen
 import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
+import com.squareup.workflow1.ui.toParcelable
+import com.squareup.workflow1.ui.toSnapshot
 import kotlinx.parcelize.Parcelize
 
 /**

samples/containers/hello-back-button/src/main/java/com/squareup/sample/hellobackbutton/HelloBackButtonWorkflow.kt

@@ -7,8 +7,8 @@ import com.squareup.sample.hellobackbutton.HelloBackButtonWorkflow.State.Baker
 import com.squareup.sample.hellobackbutton.HelloBackButtonWorkflow.State.Charlie
 import com.squareup.workflow1.Snapshot
 import com.squareup.workflow1.StatefulWorkflow
-import com.squareup.workflow1.toParcelable
-import com.squareup.workflow1.toSnapshot
+import com.squareup.workflow1.ui.toParcelable
+import com.squareup.workflow1.ui.toSnapshot
 import kotlinx.parcelize.Parcelize
 
 object HelloBackButtonWorkflow : StatefulWorkflow<Unit, State, Nothing, HelloBackButtonScreen>() {

workflow-core/api/jvm/workflow-core.api renamed to workflow-core/api/workflow-core.api

@@ -386,7 +386,7 @@ public final class com/squareup/workflow1/WorkflowIdentifier$Companion {
 	public final fun parse (Lokio/ByteString;)Lcom/squareup/workflow1/WorkflowIdentifier;
 }
 
-public final class com/squareup/workflow1/WorkflowIdentifierEx_jvmKt {
+public final class com/squareup/workflow1/WorkflowIdentifierExKt {
 	public static final fun getWorkflowIdentifier (Lkotlin/reflect/KClass;)Lcom/squareup/workflow1/WorkflowIdentifier;
 }
 

workflow-core/build.gradle.kts

@@ -2,7 +2,6 @@ import com.squareup.workflow1.buildsrc.iosWithSimulatorArm64
 
 plugins {
   id("kotlin-multiplatform")
-  id("com.android.kotlin.multiplatform.library")
   id("published")
 }
 
@@ -14,63 +13,18 @@ kotlin {
   if (targets == "kmp" || targets == "jvm") {
     jvm { withJava() }
   }
-  // The default KMP
-  // ["hierarchy template"](https://www.jetbrains.com/help/kotlin-multiplatform-dev/multiplatform-hierarchy.html#see-the-full-hierarchy-template)
-  // configures `androidMain` and `jvmMain` to be entirely separate targets, even though Android
-  // *can* be made to be a child of JVM. Changing this requires completely wiring up all targets
-  // ourselves though, so for now we've left them separate to simplify gradle config. If there ends
-  // up being too much code duplication, we can either make `androidMain` a child of `jvmMain`, or
-  // introduce a new shared target that includes both of them. Compose, for example, uses a
-  // structure where `jvm` is the shared parent of both `android` and `desktop`.
-  if (targets == "kmp" || targets == "android") {
-    androidLibrary {
-      namespace = "com.squareup.workflow1.android"
-      testNamespace = "$namespace.test"
-
-      compileSdk = libs.versions.compileSdk.get().toInt()
-      minSdk = libs.versions.minSdk.get().toInt()
-
-      withHostTestBuilder {
-      }.configure {
-      }
-
-      withDeviceTestBuilder {
-        sourceSetTreeName = "test"
-      }.configure {
-        instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        // Disable transition and rotation animations.
-        animationsDisabled = true
-      }
-    }
-  }
   if (targets == "kmp" || targets == "js") {
     js(IR) { browser() }
   }
+}
 
-  sourceSets {
-    commonMain {
-      dependencies {
-        api(libs.kotlin.jdk6)
-        api(libs.kotlinx.coroutines.core)
-        // For Snapshot.
-        api(libs.squareup.okio)
-      }
-    }
-
-    commonTest {
-      dependencies {
-        implementation(libs.kotlinx.atomicfu)
-        implementation(libs.kotlinx.coroutines.test.common)
-        implementation(libs.kotlin.test.core)
-      }
-    }
+dependencies {
+  commonMainApi(libs.kotlin.jdk6)
+  commonMainApi(libs.kotlinx.coroutines.core)
+  // For Snapshot.
+  commonMainApi(libs.squareup.okio)
 
-    getByName("androidHostTest") {
-      dependencies {
-        implementation(libs.robolectric)
-        implementation(libs.robolectric.annotations)
-      }
-    }
-  }
+  commonTestImplementation(libs.kotlinx.atomicfu)
+  commonTestImplementation(libs.kotlinx.coroutines.test.common)
+  commonTestImplementation(libs.kotlin.test.core)
 }