Skip to content

Commit e1a009e

Browse files
authored
Merge pull request #799 from bnvinay92/vn/p3-runtime
Convert :workflow-runtime to KMM
2 parents 11856b0 + b1cbe16 commit e1a009e

33 files changed

+157
-182
lines changed

workflow-runtime/build.gradle.kts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,24 @@ kotlin {
2727
}
2828
}
2929
}
30+
ios()
3031

3132
sourceSets {
32-
val jvmMain by getting {
33+
all {
34+
languageSettings.apply {
35+
optIn("kotlin.RequiresOptIn")
36+
}
37+
}
38+
val commonMain by getting {
3339
dependencies {
34-
compileOnly(libs.jetbrains.annotations)
35-
3640
api(project(":workflow-core"))
37-
api(libs.kotlin.jdk6)
3841
api(libs.kotlinx.coroutines.core)
3942
}
4043
}
41-
val jvmTest by getting {
44+
val commonTest by getting {
4245
dependencies {
43-
implementation(libs.kotlinx.coroutines.test)
46+
implementation(libs.kotlinx.coroutines.test.common)
4447
implementation(libs.kotlin.test.jdk)
45-
implementation(libs.kotlin.reflect)
4648
}
4749
}
4850
}

workflow-runtime/src/jvmMain/kotlin/com/squareup/workflow1/SimpleLoggingWorkflowInterceptor.kt renamed to workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/SimpleLoggingWorkflowInterceptor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public open class SimpleLoggingWorkflowInterceptor : WorkflowInterceptor {
113113
println(text)
114114
}
115115

116-
protected open fun logError(text: String): Unit = System.err.println(text)
116+
protected open fun logError(text: String): Unit = println("ERROR: $text")
117117

118118
private fun formatLogMessage(
119119
name: String,

0 commit comments

Comments
 (0)