Move workflow-runtime-android into android source set in workflow-runtime module. (2nd attempt)

First attempt was #1370, but got reverted in
#1378 due to it having broken something.

I need this in order to correctly consume Compose Multiplatform for the work migrating
the runtime to compose (#1442).

This reverts commit 58c1d40.

Author: zach-klippenstein

.github/workflows/kotlin.yml

@@ -694,6 +694,59 @@ jobs:
           failure-path-upload: '**/build/reports/androidTests/connected'
           failure-upload-name: core-tests-report-${{matrix.runtime}}-${{matrix.shardNum}}
 
+  # Doesn't use sharding because there are very few Android device tests in KMP.
+  kmp-instrumentation-tests:
+    name: KMP Instrumentation tests
+    runs-on: workflow-kotlin-test-runner-ubuntu-4core
+    timeout-minutes: 60
+    strategy:
+      # Allow tests to continue on other devices if they fail on one device.
+      fail-fast: false
+      matrix:
+        api-level:
+          - 31
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Instrumented tests
+        uses: ./.github/actions/gradle-tasks-with-emulator
+        with:
+          tests-name: kmp-core-tests-results-${{matrix.shardNum}}
+          api-level: ${{ matrix.api-level }}
+          test-task: connectedAndroidTest
+          write-cache-key: kmp-instrumentation-test-build-artifacts-${{matrix.shardNum}}
+          restore-cache-key: kmp-instrumentation-test-build-artifacts
+          failure-path-upload: '**/build/reports/androidTests/connected'
+          failure-upload-name: kmp-instrumentation-tests-report-${{matrix.shardNum}}
+
+  # Doesn't use sharding because there are very few Android device tests in KMP.
+  kmp-runtime-instrumentation-tests:
+    name: KMP Alternate Runtime Instrumentation tests
+    runs-on: workflow-kotlin-test-runner-ubuntu-4core
+    timeout-minutes: 60
+    strategy:
+      # Allow tests to continue on other devices if they fail on one device.
+      fail-fast: false
+      matrix:
+        api-level:
+          - 31
+        runtime: [ conflate, stateChange, drainExclusive, conflate-stateChange, partial, conflate-partial, stable, conflate-drainExclusive, stateChange-drainExclusive, partial-drainExclusive, conflate-partial-drainExclusive, all ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Instrumented tests
+        uses: ./.github/actions/gradle-tasks-with-emulator
+        with:
+          tests-name: kmp-alt-runtime-tests-results-${{matrix.runtime}}
+          api-level: ${{ matrix.api-level }}
+          test-task: connectedAndroidTest -Pworkflow.runtime=${{matrix.runtime}}
+          write-cache-key: kmp-runtime-instrumentation-test-artifacts-${{matrix.runtime}}
+          restore-cache-key: kmp-runtime-instrumentation-test-artifacts
+          failure-path-upload: '**/build/reports/androidTests/connected'
+          failure-upload-name: kmp-runtime-instrumentation-tests-report-${{matrix.runtime}}
+
   all-green:
     if: always()
     runs-on: ubuntu-latest
@@ -705,6 +758,7 @@ jobs:
       - dokka
       - unit-tests
       - instrumentation-tests
+      - kmp-instrumentation-tests
       - kmp-jvm-tests
       - kmp-ios-tests
       - kmp-js-tests
@@ -724,6 +778,7 @@ jobs:
       - ktlint
       - performance-tests
       - runtime-instrumentation-tests
+      - kmp-runtime-instrumentation-tests
       - shards-and-version
       - tutorials
 

artifacts.json

@@ -53,13 +53,22 @@
     "javaVersion": 8,
     "publicationName": "kotlinMultiplatform"
   },
+  {
+    "gradlePath": ":workflow-runtime",
+    "group": "com.squareup.workflow1",
+    "artifactId": "workflow-runtime-android",
+    "description": "Workflow Runtime",
+    "packaging": "aar",
+    "javaVersion": 17,
+    "publicationName": "android"
+  },
   {
     "gradlePath": ":workflow-runtime",
     "group": "com.squareup.workflow1",
     "artifactId": "workflow-runtime-iosarm64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "iosArm64"
   },
   {
@@ -68,7 +77,7 @@
     "artifactId": "workflow-runtime-iossimulatorarm64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "iosSimulatorArm64"
   },
   {
@@ -77,7 +86,7 @@
     "artifactId": "workflow-runtime-iosx64",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "iosX64"
   },
   {
@@ -86,7 +95,7 @@
     "artifactId": "workflow-runtime-js",
     "description": "Workflow Runtime",
     "packaging": "klib",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "js"
   },
   {
@@ -95,7 +104,7 @@
     "artifactId": "workflow-runtime-jvm",
     "description": "Workflow Runtime",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "publicationName": "jvm"
   },
   {
@@ -104,18 +113,9 @@
     "artifactId": "workflow-runtime",
     "description": "Workflow Runtime",
     "packaging": "jar",
-    "javaVersion": 8,
+    "javaVersion": 17,
     "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",

build.gradle.kts

@@ -37,7 +37,6 @@ apply(from = rootProject.file(".buildscript/binary-validation.gradle"))
 dependencies {
   dokka(project(":workflow-core"))
   dokka(project(":workflow-runtime"))
-  dokka(project(":workflow-runtime-android"))
   dokka(project(":workflow-rx2"))
   dokka(project(":workflow-testing"))
   dokka(project(":workflow-ui:compose"))

gradle/libs.versions.toml

@@ -192,6 +192,7 @@ androidx-transition = { module = "androidx.transition:transition", version.ref =
 
 androidx-viewbinding = { module = "androidx.databinding:viewbinding", version.ref = "androidx-viewbinding" }
 
+burst = { module = "app.cash.burst:burst", version.ref = "burst" }
 burst-plugin = { module = "app.cash.burst:burst-gradle-plugin", version.ref = "burst" }
 
 dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }

settings.gradle.kts

@@ -62,7 +62,6 @@ 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,10 +1,66 @@
+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.8
+androidx.compose.runtime:runtime-saveable-android:1.7.8
+androidx.compose.runtime:runtime-saveable:1.7.8
+androidx.compose.runtime:runtime:1.7.8
+androidx.compose.ui:ui-android:1.7.8
+androidx.compose.ui:ui-geometry-android:1.7.8
+androidx.compose.ui:ui-geometry:1.7.8
+androidx.compose.ui:ui-graphics-android:1.7.8
+androidx.compose.ui:ui-graphics:1.7.8
+androidx.compose.ui:ui-text-android:1.7.8
+androidx.compose.ui:ui-text:1.7.8
+androidx.compose.ui:ui-unit-android:1.7.8
+androidx.compose.ui:ui-unit:1.7.8
+androidx.compose.ui:ui-util-android:1.7.8
+androidx.compose.ui:ui-util:1.7.8
+androidx.compose:compose-bom:2025.03.01
+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.1.21
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
 org.jetbrains.kotlin:kotlin-stdlib:2.1.21
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0