Skip to content

Commit 58c1d40

Browse files
zach-klippensteinzach-klippenstein
committed
Revert "Merge pull request #1370 from square/zachklipp/runtime-android"
This reverts commit fc9e379, reversing changes made to f4e1297.
1 parent 8557c2c commit 58c1d40

File tree

29 files changed

+107
-200
lines changed

29 files changed

+107
-200
lines changed

‎artifacts.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,6 @@
7171
"javaVersion": 8,
7272
"publicationName": "kotlinMultiplatform"
7373
},
74-
{
75-
"gradlePath": ":workflow-runtime",
76-
"group": "com.squareup.workflow1",
77-
"artifactId": "workflow-runtime-android",
78-
"description": "Workflow Runtime",
79-
"packaging": "aar",
80-
"javaVersion": 8,
81-
"publicationName": "android"
82-
},
8374
{
8475
"gradlePath": ":workflow-runtime",
8576
"group": "com.squareup.workflow1",
@@ -134,6 +125,15 @@
134125
"javaVersion": 8,
135126
"publicationName": "kotlinMultiplatform"
136127
},
128+
{
129+
"gradlePath": ":workflow-runtime-android",
130+
"group": "com.squareup.workflow1",
131+
"artifactId": "workflow-runtime-android",
132+
"description": "Workflow Runtime Android",
133+
"packaging": "aar",
134+
"javaVersion": 8,
135+
"publicationName": "maven"
136+
},
137137
{
138138
"gradlePath": ":workflow-rx2",
139139
"group": "com.squareup.workflow1",

‎settings.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ include(
6464
":workflow-config:config-jvm",
6565
":workflow-core",
6666
":workflow-runtime",
67+
":workflow-runtime-android",
6768
":workflow-rx2",
6869
":workflow-testing",
6970
":workflow-tracing",

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

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,10 @@
1-
androidx.activity:activity-ktx:1.7.0
2-
androidx.activity:activity:1.7.0
3-
androidx.annotation:annotation-experimental:1.4.1
4-
androidx.annotation:annotation-jvm:1.8.1
5-
androidx.annotation:annotation:1.8.1
6-
androidx.arch.core:core-common:2.2.0
7-
androidx.arch.core:core-runtime:2.2.0
8-
androidx.autofill:autofill:1.0.0
9-
androidx.collection:collection-jvm:1.4.4
10-
androidx.collection:collection-ktx:1.4.4
11-
androidx.collection:collection:1.4.4
12-
androidx.compose.runtime:runtime-android:1.7.2
13-
androidx.compose.runtime:runtime-saveable-android:1.7.2
14-
androidx.compose.runtime:runtime-saveable:1.7.2
15-
androidx.compose.runtime:runtime:1.7.2
16-
androidx.compose.ui:ui-android:1.7.2
17-
androidx.compose.ui:ui-geometry-android:1.7.2
18-
androidx.compose.ui:ui-geometry:1.7.2
19-
androidx.compose.ui:ui-graphics-android:1.7.2
20-
androidx.compose.ui:ui-graphics:1.7.2
21-
androidx.compose.ui:ui-text-android:1.7.2
22-
androidx.compose.ui:ui-text:1.7.2
23-
androidx.compose.ui:ui-unit-android:1.7.2
24-
androidx.compose.ui:ui-unit:1.7.2
25-
androidx.compose.ui:ui-util-android:1.7.2
26-
androidx.compose.ui:ui-util:1.7.2
27-
androidx.compose:compose-bom:2024.09.02
28-
androidx.concurrent:concurrent-futures:1.1.0
29-
androidx.core:core-ktx:1.12.0
30-
androidx.core:core:1.12.0
31-
androidx.customview:customview-poolingcontainer:1.0.0
32-
androidx.emoji2:emoji2:1.2.0
33-
androidx.graphics:graphics-path:1.0.1
34-
androidx.interpolator:interpolator:1.0.0
35-
androidx.lifecycle:lifecycle-common-jvm:2.8.7
36-
androidx.lifecycle:lifecycle-common:2.8.7
37-
androidx.lifecycle:lifecycle-livedata-core:2.8.7
38-
androidx.lifecycle:lifecycle-process:2.8.7
39-
androidx.lifecycle:lifecycle-runtime-android:2.8.7
40-
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
41-
androidx.lifecycle:lifecycle-runtime-compose:2.8.7
42-
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
43-
androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
44-
androidx.lifecycle:lifecycle-runtime:2.8.7
45-
androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
46-
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
47-
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
48-
androidx.lifecycle:lifecycle-viewmodel:2.8.7
49-
androidx.profileinstaller:profileinstaller:1.3.1
50-
androidx.savedstate:savedstate-ktx:1.2.1
51-
androidx.savedstate:savedstate:1.2.1
52-
androidx.startup:startup-runtime:1.1.1
53-
androidx.tracing:tracing:1.0.0
54-
androidx.versionedparcelable:versionedparcelable:1.1.1
55-
com.google.guava:listenablefuture:1.0
561
com.squareup.okio:okio-jvm:3.3.0
572
com.squareup.okio:okio:3.3.0
583
org.jetbrains.kotlin:kotlin-bom:2.0.21
594
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
605
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
616
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
627
org.jetbrains.kotlin:kotlin-stdlib:2.0.21
63-
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
648
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
659
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
6610
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3

‎workflow-runtime-android/README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Module Workflow Runtime Android
2+
3+
This module is an Android library that contains utilities to start a Workflow runtime that are
4+
specific to Android components. This contains only the 'headless' components for Workflow on
5+
Android; i.e. no UI concerns.
6+
7+
See :workflow-ui:core-android for the complimentary helpers on Android that include UI concerns:
8+
view model persistent, `WorkflowLayout`, etc.
9+
10+
It also provides a place to include tests that verify behaviour of the runtime while using
11+
Android specific dispatchers.

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
public final class com/squareup/workflow1/android/AndroidRenderWorkflowKt {
2+
public static final fun removeWorkflowState (Landroidx/lifecycle/SavedStateHandle;)V
3+
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;
4+
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;
5+
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;
6+
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;
7+
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;
8+
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;
9+
}
10+

‎workflow-runtime-android/build.gradle.kts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
plugins {
2+
id("com.android.library")
3+
id("kotlin-android")
4+
id("android-defaults")
5+
id("android-ui-tests")
6+
id("app.cash.burst")
7+
id("published")
8+
}
9+
10+
android {
11+
namespace = "com.squareup.workflow1.android"
12+
testNamespace = "$namespace.test"
13+
}
14+
15+
dependencies {
16+
val composeBom = platform(libs.androidx.compose.bom)
17+
18+
api(project(":workflow-runtime"))
19+
api(libs.androidx.compose.ui.android)
20+
api(libs.androidx.lifecycle.viewmodel.savedstate)
21+
22+
implementation(composeBom)
23+
implementation(project(":workflow-core"))
24+
25+
androidTestImplementation(libs.androidx.activity.ktx)
26+
androidTestImplementation(libs.androidx.lifecycle.viewmodel.ktx)
27+
androidTestImplementation(libs.androidx.test.core)
28+
androidTestImplementation(libs.androidx.test.truth)
29+
androidTestImplementation(libs.kotlin.test.core)
30+
androidTestImplementation(libs.kotlin.test.jdk)
31+
androidTestImplementation(libs.kotlinx.coroutines.android)
32+
androidTestImplementation(libs.kotlinx.coroutines.core)
33+
androidTestImplementation(libs.kotlinx.coroutines.test)
34+
androidTestImplementation(libs.squareup.papa)
35+
}

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

File renamed without changes.

‎workflow-runtime-android/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
POM_ARTIFACT_ID=workflow-runtime-android
2+
POM_NAME=Workflow Runtime Android
3+
POM_PACKAGING=aar

workflow-runtime/src/androidDeviceTest/kotlin/AndroidManifest.xml renamed to workflow-runtime-android/src/androidTest/AndroidManifest.xml

File renamed without changes.

workflow-runtime/src/androidDeviceTest/kotlin/com/squareup/workflow1/android/AndroidDispatchersRenderWorkflowInTest.kt renamed to workflow-runtime-android/src/androidTest/java/com/squareup/workflow1/android/AndroidDispatchersRenderWorkflowInTest.kt

File renamed without changes.

0 commit comments

Comments
 (0)