Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configure wasm supports for landscapist modules containing coil3 #562

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Configure wasm supports for landscapist modules containing coil3 #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions build-logic/convention/src/main/kotlin/ComposeMultiplatformWasmLibraryConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}
}

Expand Down
6 changes: 1 addition & 5 deletions build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatformWasm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -37,8 +34,7 @@ internal fun Project.configureComposeMultiplatformWasm(
kotlinMultiplatformExtension.apply {
androidTarget { publishLibraryVariants("release") }
jvm("desktop")

@OptIn(ExperimentalWasmDsl::class)

wasmJs {
browser {
testTask {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down