diff --git a/build-logic/convention/src/main/kotlin/ComposeMultiplatformWasmLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/ComposeMultiplatformWasmLibraryConventionPlugin.kt index 34118c73..0d0c47bc 100644 --- a/build-logic/convention/src/main/kotlin/ComposeMultiplatformWasmLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/ComposeMultiplatformWasmLibraryConventionPlugin.kt @@ -15,10 +15,7 @@ */ import com.android.build.gradle.LibraryExtension -import com.skydoves.landscapist.configureAndroidCompose -import com.skydoves.landscapist.configureComposeMultiplatform -import com.skydoves.landscapist.configureKotlinAndroid -import com.skydoves.landscapist.kotlinOptions +import com.skydoves.landscapist.configureComposeMultiplatformWasm import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.artifacts.VersionCatalogsExtension @@ -40,7 +37,7 @@ class ComposeMultiplatformWasmLibraryConventionPlugin : Plugin { extensions.configure libraryExtension@{ extensions.configure kmpExtension@{ - configureComposeMultiplatform(this@libraryExtension, this@kmpExtension) + configureComposeMultiplatformWasm(this@libraryExtension, this@kmpExtension) } } diff --git a/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatformWasm.kt b/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatformWasm.kt index 7bb05a6a..d5c4e656 100644 --- a/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatformWasm.kt +++ b/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatformWasm.kt @@ -20,10 +20,7 @@ package com.skydoves.landscapist import com.android.build.api.dsl.CommonExtension import org.gradle.api.Project -import org.gradle.api.Task -import org.gradle.kotlin.dsl.invoke import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension -import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl /** * Configure Compose-Multiplatform-specific options @@ -37,8 +34,7 @@ internal fun Project.configureComposeMultiplatformWasm( kotlinMultiplatformExtension.apply { androidTarget { publishLibraryVariants("release") } jvm("desktop") - - @OptIn(ExperimentalWasmDsl::class) + wasmJs { browser { testTask { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f9604f0a..a13a2f88 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ kotlin = "2.0.20" dokka = "1.9.20" jvmTarget = "11" nexusPlugin = "0.29.0" -kotlinxCoroutines = "1.8.1" +kotlinxCoroutines = "1.9.0" kotlinBinaryCompatibility = "0.16.3" androidGradlePlugin = "8.6.1" androidxActivity = "1.9.2"