diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3ff791e..ce4862f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -tools = "0.14.9-kotlin-1.8.20" -kotlin = "1.8.20" +tools = "0.14.9-kotlin-1.9.0-RC-dev-1" +kotlin = "1.9.0-RC" atomicfu = "0.20.2" binary-compatibility-validator = "0.13.1" changelog = "2.0.0" @@ -8,12 +8,12 @@ dokka = "1.8.10" kotlin-jupyter = "0.11.0-360" kotlinx-benchmark = "0.4.7" kotlinx-cli = "0.3.5" -kotlinx-coroutines = "1.7.0-RC" +kotlinx-coroutines = "1.7.1" kotlinx-datetime = "0.4.0" kotlinx-html = "0.8.0" kotlinx-knit = "0.4.0" kotlinx-nodejs = "0.0.7" -kotlinx-serialization = "1.5.0" +kotlinx-serialization = "1.5.1" ktor = "2.3.0" xmlutil = "0.86.0" yamlkt = "0.13.0" diff --git a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index 3535991..0762650 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -437,7 +437,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro testTask { useKarma { this.webpackConfig.experiments.add("topLevelAwait") - useChromeHeadless() + useChromeHeadlessWasmGc() useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm")) } } @@ -474,7 +474,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro binaries.executable() browser { webpackTask { - outputFileName = bundleName + mainOutputFileName.set(bundleName) } browserConfig() } @@ -564,6 +564,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro } configure(nativeTargets) { + compilations["main"]?.apply { configure(kotlinSourceSets) { dependsOn(nativeMain) diff --git a/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt index 2b73d9e..4e1dda3 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt @@ -12,6 +12,9 @@ import org.jetbrains.changelog.ChangelogPlugin import org.jetbrains.changelog.ChangelogPluginExtension import org.jetbrains.dokka.gradle.AbstractDokkaTask import org.jetbrains.dokka.gradle.DokkaPlugin +import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport +import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin +import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension import space.kscience.gradle.internal.* /** @@ -104,8 +107,8 @@ public open class KScienceProjectPlugin : Plugin { apply() apply() - allprojects{ - repositories{ + allprojects { + repositories { mavenCentral() maven("https://repo.kotlin.link") maven("https://maven.pkg.jetbrains.space/spc/p/sci/dev") @@ -250,9 +253,11 @@ public open class KScienceProjectPlugin : Plugin { } } - plugins.withType(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin::class.java) { - rootProject.the().lockFileDirectory = - rootDir.resolve("gradle") + plugins.withType() { + rootProject.configure { + lockFileDirectory = rootDir.resolve("gradle") + yarnLockMismatchReport = YarnLockMismatchReport.WARNING + } } }