Merge pull request #120 from mmkolpakov/fix/kmp-hierarchy

Fix: KMP dependency resolution for native and Wasm targets

Author: nsk90

kstatemachine-coroutines/build.gradle.kts

@@ -45,18 +45,5 @@ kotlin {
             }
         }
 
-        // contains blocking APIs which are not supported on JS
-        val blockingMain by creating { dependsOn(commonMain.get()) }
-        val jsCommonMain by creating { dependsOn(commonMain.get()) }
-
-        jvmMain.get().dependsOn(blockingMain)
-        iosMain.get().dependsOn(blockingMain)
-        macosMain.get().dependsOn(blockingMain)
-        linuxMain.get().dependsOn(blockingMain)
-        mingwMain.get().dependsOn(blockingMain)
-
-        val wasmJsMain by getting
-        wasmJsMain.dependsOn(jsCommonMain)
-        jsMain.get().dependsOn(jsCommonMain)
     }
 }

…nes/CoroutinesLibCoroutineAbstraction.kt …/kstatemachine/coroutines/RunBlocking.ktkstatemachine-coroutines/src/jsCommonMain/kotlin/ru/nsk/kstatemachine/coroutines/CoroutinesLibCoroutineAbstraction.kt renamed to kstatemachine-coroutines/src/jsMain/kotlin/ru/nsk/kstatemachine/coroutines/RunBlocking.kt kstatemachine-coroutines/src/jsCommonMain/kotlin/ru/nsk/kstatemachine/coroutines/CoroutinesLibCoroutineAbstraction.kt renamed to kstatemachine-coroutines/src/jsMain/kotlin/ru/nsk/kstatemachine/coroutines/RunBlocking.kt

@@ -0,0 +1,15 @@
+/*
+ * Author: Mikhail Fedotov
+ * Github: https://github.com/KStateMachine
+ * Copyright (c) 2024.
+ * All rights reserved.
+ */
+
+package ru.nsk.kstatemachine.coroutines
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.runBlocking
+import kotlin.coroutines.CoroutineContext
+
+internal actual fun <T> doRunBlocking(context: CoroutineContext, block: suspend CoroutineScope.() -> T): T =
+    runBlocking(context, block)

…/kstatemachine/coroutines/RunBlocking.kt …/kstatemachine/coroutines/RunBlocking.ktkstatemachine-coroutines/src/blockingMain/kotlin/ru/nsk/kstatemachine/coroutines/RunBlocking.kt renamed to kstatemachine-coroutines/src/jvmMain/kotlin/ru/nsk/kstatemachine/coroutines/RunBlocking.kt kstatemachine-coroutines/src/blockingMain/kotlin/ru/nsk/kstatemachine/coroutines/RunBlocking.kt renamed to kstatemachine-coroutines/src/jvmMain/kotlin/ru/nsk/kstatemachine/coroutines/RunBlocking.kt

@@ -0,0 +1,29 @@
+/*
+ * Author: Mikhail Fedotov
+ * Github: https://github.com/KStateMachine
+ * Copyright (c) 2024.
+ * All rights reserved.
+ */
+
+package ru.nsk.kstatemachine.statemachine
+
+import kotlinx.coroutines.CoroutineScope
+import ru.nsk.kstatemachine.coroutines.CoroutinesLibCoroutineAbstraction
+import ru.nsk.kstatemachine.coroutines.createStateMachine
+import ru.nsk.kstatemachine.state.ChildMode
+
+/**
+ * Blocking [createStateMachine] alternative
+ */
+fun createStateMachineBlocking(
+    scope: CoroutineScope,
+    name: String? = null,
+    childMode: ChildMode = ChildMode.EXCLUSIVE,
+    start: Boolean = true,
+    creationArguments: CreationArguments = buildCreationArguments {},
+    init: suspend BuildingStateMachine.() -> Unit
+) = with(CoroutinesLibCoroutineAbstraction(scope)) {
+    runBlocking {
+        createStateMachine(name, childMode, start, creationArguments, init)
+    }
+}

…achine/CoroutinesStateMachineBlocking.kt …achine/CoroutinesStateMachineBlocking.ktkstatemachine-coroutines/src/blockingMain/kotlin/ru/nsk/kstatemachine/statemachine/CoroutinesStateMachineBlocking.kt renamed to kstatemachine-coroutines/src/jvmMain/kotlin/ru/nsk/kstatemachine/statemachine/CoroutinesStateMachineBlocking.kt kstatemachine-coroutines/src/blockingMain/kotlin/ru/nsk/kstatemachine/statemachine/CoroutinesStateMachineBlocking.kt renamed to kstatemachine-coroutines/src/jvmMain/kotlin/ru/nsk/kstatemachine/statemachine/CoroutinesStateMachineBlocking.kt

@@ -0,0 +1,18 @@
+/*
+ * Author: Mikhail Fedotov
+ * Github: https://github.com/KStateMachine
+ * Copyright (c) 2024.
+ * All rights reserved.
+ */
+
+package ru.nsk.kstatemachine.coroutines
+
+import kotlinx.coroutines.CoroutineScope
+import ru.nsk.kstatemachine.statemachine.StateMachine
+import kotlin.coroutines.CoroutineContext
+
+internal actual fun <T> doRunBlocking(context: CoroutineContext, block: suspend CoroutineScope.() -> T): T =
+    throw UnsupportedOperationException(
+        "This platform does not support kotlinx.coroutines.runBlocking(). " +
+                "Do not use blocking API or use ${StateMachine::class.simpleName} without coroutines support"
+    )

kstatemachine-coroutines/src/nativeMain/kotlin/ru/nsk/kstatemachine/coroutines/RunBlocking.kt

@@ -46,18 +46,5 @@ kotlin {
             }
         }
 
-        // contains blocking APIs which are not supported on JS
-        val blockingMain by creating { dependsOn(commonMain.get()) }
-        val jsCommonMain by creating { dependsOn(commonMain.get()) }
-
-        jvmMain.get().dependsOn(blockingMain)
-        iosMain.get().dependsOn(blockingMain)
-        macosMain.get().dependsOn(blockingMain)
-        linuxMain.get().dependsOn(blockingMain)
-        mingwMain.get().dependsOn(blockingMain)
-
-        val wasmJsMain by getting
-        wasmJsMain.dependsOn(jsCommonMain)
-        jsMain.get().dependsOn(jsCommonMain)
     }
 }