Skip to content

Commit 9fc20e5

Browse files
committed
Fix support for wasm.
1 parent ef67a7c commit 9fc20e5

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieMultiCompileRuntime.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
2727
typealias PublishTaskNamesWithTasks = Map<Pair<String, List<String>>, TaskProvider<Task>>
2828
typealias SupportedTargetsWithDeclarations = List<Pair<MultiCompileTarget, String>>
2929

30-
class SkieMultiCompileRuntime: Plugin<Project> {
30+
class SkieMultiCompileRuntime : Plugin<Project> {
3131

3232
override fun apply(target: Project) = with(target) {
3333
val extension = extensions.create<MultiCompileRuntimeExtension>("multiCompileRuntime")
@@ -177,7 +177,7 @@ class SkieMultiCompileRuntime: Plugin<Project> {
177177
include(extension.sourceIncludes.get())
178178
filter(
179179
ReplaceTokens::class,
180-
"tokens" to tokens.get()
180+
"tokens" to tokens.get(),
181181
)
182182
}
183183
into(layout.buildDirectory.dir("${this@registerCopyTask.name}_$name"))
@@ -201,10 +201,12 @@ class SkieMultiCompileRuntime: Plugin<Project> {
201201
supportedTargetsWithDeclarations.flatMap { (target, _) ->
202202
when (target.platformType) {
203203
KotlinPlatformType.common -> listOf("metadataMainClasses")
204-
KotlinPlatformType.jvm, KotlinPlatformType.androidJvm -> listOf("${target.name}Jar")
205-
KotlinPlatformType.js -> listOf("${target.name}Jar")
206-
207-
KotlinPlatformType.native, KotlinPlatformType.wasm -> if (kotlinVersion >= kotlin_2_1_0) {
204+
KotlinPlatformType.jvm,
205+
KotlinPlatformType.androidJvm,
206+
KotlinPlatformType.js,
207+
KotlinPlatformType.wasm,
208+
-> listOf("${target.name}Jar")
209+
KotlinPlatformType.native -> if (kotlinVersion >= kotlin_2_1_0) {
208210
listOf("${target.name}Klib")
209211
} else {
210212
listOf("${target.name}MainKlibrary")
@@ -218,7 +220,7 @@ class SkieMultiCompileRuntime: Plugin<Project> {
218220
private fun Project.registerPublishTask(
219221
name: String,
220222
copyTask: TaskProvider<Copy>,
221-
publishTaskNamesWithTasks: Map<Pair<String, List<String>>, TaskProvider<Task>>
223+
publishTaskNamesWithTasks: Map<Pair<String, List<String>>, TaskProvider<Task>>,
222224
) {
223225
publishTaskNamesWithTasks.forEach { (publishTaskNames, parentPublishTask) ->
224226
val (publishTaskName, publishTasks) = publishTaskNames

0 commit comments

Comments
 (0)