Skip to content

Commit 9e0b200

Browse files
committed
Setup wasmJs source sets to use old wasm directory
1 parent bd4b2e4 commit 9e0b200

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

build-logic/src/main/kotlin/kotlinx/io/conventions/kotlinx-io-multiplatform.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ kotlin {
3838
}
3939

4040
@OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
41-
wasm {
41+
wasmJs {
4242
nodejs()
4343
// Disabled because we can't exclude some tests: https://youtrack.jetbrains.com/issue/KT-58291
4444
// browser()
@@ -89,6 +89,12 @@ kotlin {
8989
createSourceSet("linuxTest", parent = unixTest, children = linuxTargets())
9090
createSourceSet("androidMain", parent = unixMain, children = androidTargets())
9191
createSourceSet("androidTest", parent = unixTest, children = androidTargets())
92+
getByName("wasmJsMain") {
93+
kotlin.srcDir(File(File(projectDir, "wasm"), "src"))
94+
}
95+
getByName("wasmJsTest") {
96+
kotlin.srcDir(File(File(projectDir, "wasm"), "test"))
97+
}
9298
}
9399
}
94100

core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ kotlin {
3232
}
3333

3434
@OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
35-
wasm {
35+
wasmJs {
3636
nodejs {
3737
testTask(Action {
3838
useMocha {

0 commit comments

Comments
 (0)