diff --git a/mosaic-runtime/build.gradle b/mosaic-runtime/build.gradle index 28773944..cf22a600 100644 --- a/mosaic-runtime/build.gradle +++ b/mosaic-runtime/build.gradle @@ -1,4 +1,5 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType +import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget apply plugin: 'org.jetbrains.kotlin.multiplatform' apply from: "$rootDir/addAllTargets.gradle" @@ -37,11 +38,12 @@ kotlin { } targets.each { target -> + if (target instanceof KotlinMetadataTarget) return if (target.platformType != KotlinPlatformType.jvm) { - target.compilations.main.source(sourceSets.nonJvmMain) + target.compilations.main.defaultSourceSet.dependsOn(sourceSets.nonJvmMain) } if (target.platformType == KotlinPlatformType.native) { - target.compilations.main.source(sourceSets.concurrentMain) + target.compilations.main.defaultSourceSet.dependsOn(sourceSets.concurrentMain) } } } diff --git a/mosaic-runtime/src/concurrentMain/kotlin/com/jakewharton/mosaic/blocking.kt b/mosaic-runtime/src/concurrentMain/kotlin/com/jakewharton/mosaic/blocking.kt index 3d1aa9ab..3cd91620 100644 --- a/mosaic-runtime/src/concurrentMain/kotlin/com/jakewharton/mosaic/blocking.kt +++ b/mosaic-runtime/src/concurrentMain/kotlin/com/jakewharton/mosaic/blocking.kt @@ -1,3 +1,9 @@ package com.jakewharton.mosaic -expect fun runMosaicBlocking(body: suspend MosaicScope.() -> Unit) +import kotlinx.coroutines.runBlocking + +fun runMosaicBlocking(body: suspend MosaicScope.() -> Unit) { + runBlocking { + runMosaic(body) + } +} diff --git a/mosaic-runtime/src/jvmMain/kotlin/com/jakewharton/mosaic/blocking.kt b/mosaic-runtime/src/jvmMain/kotlin/com/jakewharton/mosaic/blocking.kt deleted file mode 100644 index 3f477c67..00000000 --- a/mosaic-runtime/src/jvmMain/kotlin/com/jakewharton/mosaic/blocking.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.jakewharton.mosaic - -import kotlinx.coroutines.runBlocking - -actual fun runMosaicBlocking(body: suspend MosaicScope.() -> Unit) { - runBlocking { - runMosaic(body) - } -} diff --git a/mosaic-runtime/src/linuxX64Main/kotlin/com/jakewharton/mosaic/blocking.kt b/mosaic-runtime/src/linuxX64Main/kotlin/com/jakewharton/mosaic/blocking.kt deleted file mode 100644 index 3f477c67..00000000 --- a/mosaic-runtime/src/linuxX64Main/kotlin/com/jakewharton/mosaic/blocking.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.jakewharton.mosaic - -import kotlinx.coroutines.runBlocking - -actual fun runMosaicBlocking(body: suspend MosaicScope.() -> Unit) { - runBlocking { - runMosaic(body) - } -} diff --git a/mosaic-runtime/src/macosArm64Main/kotlin/com/jakewharton/mosaic/blocking.kt b/mosaic-runtime/src/macosArm64Main/kotlin/com/jakewharton/mosaic/blocking.kt deleted file mode 100644 index 3f477c67..00000000 --- a/mosaic-runtime/src/macosArm64Main/kotlin/com/jakewharton/mosaic/blocking.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.jakewharton.mosaic - -import kotlinx.coroutines.runBlocking - -actual fun runMosaicBlocking(body: suspend MosaicScope.() -> Unit) { - runBlocking { - runMosaic(body) - } -} diff --git a/mosaic-runtime/src/macosX64Main/kotlin/com/jakewharton/mosaic/blocking.kt b/mosaic-runtime/src/macosX64Main/kotlin/com/jakewharton/mosaic/blocking.kt deleted file mode 100644 index 3f477c67..00000000 --- a/mosaic-runtime/src/macosX64Main/kotlin/com/jakewharton/mosaic/blocking.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.jakewharton.mosaic - -import kotlinx.coroutines.runBlocking - -actual fun runMosaicBlocking(body: suspend MosaicScope.() -> Unit) { - runBlocking { - runMosaic(body) - } -} diff --git a/mosaic-runtime/src/mingwX64Main/kotlin/com/jakewharton/mosaic/blocking.kt b/mosaic-runtime/src/mingwX64Main/kotlin/com/jakewharton/mosaic/blocking.kt deleted file mode 100644 index 3f477c67..00000000 --- a/mosaic-runtime/src/mingwX64Main/kotlin/com/jakewharton/mosaic/blocking.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.jakewharton.mosaic - -import kotlinx.coroutines.runBlocking - -actual fun runMosaicBlocking(body: suspend MosaicScope.() -> Unit) { - runBlocking { - runMosaic(body) - } -}