From 185b5514c3c2619e6ca22626712fdca12e6a204b Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 18 Feb 2023 18:56:15 +0300 Subject: [PATCH] Roll back serialization version for compatibility --- gradle/libs.versions.toml | 6 +++--- src/main/kotlin/space/kscience/gradle/KScienceExtension.kt | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3d160c9..7186436 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -tools = "0.14.1-kotlin-1.8.20-Beta" -kotlin = "1.8.20-Beta" +tools = "0.14.2-kotlin-1.8.10" +kotlin = "1.8.10" atomicfu = "0.19.0" binary-compatibility-validator = "0.12.1" changelog = "2.0.0" @@ -13,7 +13,7 @@ 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-RC" +kotlinx-serialization = "1.4.1" ktor = "2.2.3" xmlutil = "0.84.3" yamlkt = "0.12.0" diff --git a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index e0aa6bf..51d9e0a 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBrowserDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmTargetDsl @@ -381,6 +382,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro } } + @OptIn(ExperimentalWasmDsl::class) public fun wasm(block: KotlinWasmTargetDsl.() -> Unit = {}) { project.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") { project.configure {