Skip to content

Commit afa964b

Browse files
authored
Merge pull request #59 from rickclephas/feature/coroutines-1.8.0
kotlinx.coroutines 1.8.0
2 parents 4a1389c + e067308 commit afa964b

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

build.gradle.kts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
2+
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
3+
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
4+
15
plugins {
26
@Suppress("DSL_SCOPE_VIOLATION")
37
alias(libs.plugins.android.library) apply false
@@ -22,3 +26,14 @@ allprojects {
2226
google()
2327
}
2428
}
29+
30+
// TODO: Remove once default NodeJS version supports wasm
31+
plugins.withType<NodeJsRootPlugin> {
32+
extensions.configure(NodeJsRootExtension::class) {
33+
nodeVersion = "21.0.0-v8-canary20231019bd785be450"
34+
nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
35+
}
36+
tasks.withType<KotlinNpmInstallTask> {
37+
args.add("--ignore-engines")
38+
}
39+
}

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
22
kotlin = "1.9.22"
3-
kotlinx-coroutines = "1.7.3"
3+
kotlinx-coroutines = "1.8.0"
44
android = "7.4.2"
55
androidx-lifecycle = "2.6.2"
66

77
# Sample versions
88
androidx-compose = "2023.10.01"
99
androidx-compose-compiler = "1.5.8-dev-k1.9.22-42b6ec2b037"
1010
androidx-fragment = "1.6.2"
11-
ksp = "1.9.22-1.0.16"
12-
nativecoroutines = "1.0.0-ALPHA-24"
11+
ksp = "1.9.22-1.0.17"
12+
nativecoroutines = "1.0.0-ALPHA-25"
1313

1414
[libraries]
1515
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }

kmm-viewmodel-core/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
2+
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
23

34
plugins {
45
@Suppress("DSL_SCOPE_VIOLATION")
@@ -20,6 +21,7 @@ kotlin {
2021
withJs()
2122
group("linux")
2223
group("mingw")
24+
withWasm()
2325
}
2426
}
2527
}
@@ -50,6 +52,12 @@ kotlin {
5052
linuxArm64()
5153
linuxX64()
5254
mingwX64()
55+
@OptIn(ExperimentalWasmDsl::class)
56+
wasmJs {
57+
browser()
58+
nodejs()
59+
d8()
60+
}
5361
//endregion
5462

5563
targets.all {

0 commit comments

Comments
 (0)