From 20ed541413b2b591a9b8318cc8ce1ba1a5f7394f Mon Sep 17 00:00:00 2001 From: BoD Date: Thu, 15 Feb 2024 10:10:01 +0100 Subject: [PATCH 1/2] Bump Kotlin to 2.0.0-Beta4 --- gradle/libraries.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/libraries.toml b/gradle/libraries.toml index 61922900d39..eff0e3d5773 100644 --- a/gradle/libraries.toml +++ b/gradle/libraries.toml @@ -19,20 +19,20 @@ apollo = "4.0.0-beta.5-SNAPSHOT" apollo-published = "4.0.0-beta.3" cache = "2.0.2" # See https://developer.android.com/jetpack/androidx/releases/compose-kotlin -compose-compiler = "1.5.9-dev-k2.0.0-Beta3-7c5ec6895a0" +compose-compiler = "1.5.11-dev-k2.0.0-Beta4-21f5e479a96" compose = "1.5.1" guava = "31.1-jre" javaPoet = "1.13.0" jetbrains-annotations = "24.0.1" junit = "4.13.2" kotlin-plugin-min = "1.8.0" -kotlin-plugin = "2.0.0-Beta3" -kotlin-plugin-max = "2.0.0-Beta3" -kotlin-stdlib = "2.0.0-Beta3" +kotlin-plugin = "2.0.0-Beta4" +kotlin-plugin-max = "2.0.0-Beta4" +kotlin-stdlib = "2.0.0-Beta4" kotlinx-coroutines = "1.8.0-RC2" kotlinx-datetime = "0.5.0" kotlinx-serialization-runtime = "1.6.2" -ksp = "2.0.0-Beta3-1.0.17" +ksp = "2.0.0-Beta4-1.0.17" okio = "3.6.0" ktor = "2.3.7" okhttp = "4.11.0" From b9528b38ba8c5fadd53d9e662f376a5634007b0f Mon Sep 17 00:00:00 2001 From: BoD Date: Thu, 15 Feb 2024 10:12:12 +0100 Subject: [PATCH 2/2] Opt-in ExperimentalWasmDsl --- build-logic/src/main/kotlin/Mpp.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-logic/src/main/kotlin/Mpp.kt b/build-logic/src/main/kotlin/Mpp.kt index ee55faaa77b..ce297428b4c 100644 --- a/build-logic/src/main/kotlin/Mpp.kt +++ b/build-logic/src/main/kotlin/Mpp.kt @@ -1,11 +1,11 @@ + import org.gradle.api.Action import org.gradle.api.Project import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtension -import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrLink +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget -import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink internal val allAppleTargets = setOf( "macosX64", @@ -103,6 +103,7 @@ fun Project.configureMpp( } } if (withWasm) { + @OptIn(ExperimentalWasmDsl::class) wasmJs { nodejs() }