Merge pull request #562 from skydoves/wasm/kmp-wasm

Configure wasm supports for landscapist modules containing coil3
skydoves · Sep 24, 2024 · ce13cc2 · ce13cc2
2 parents c71e6ce + 268e74f
commit ce13cc2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git 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<Project> {
 
       extensions.configure<LibraryExtension> libraryExtension@{
         extensions.configure<KotlinMultiplatformExtension> 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
@@ -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
@@ -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"