From 41522338c701d950a8eca5d834936bd8873c9c8a Mon Sep 17 00:00:00 2001 From: Maciej Procyk Date: Wed, 17 Jan 2024 21:25:36 +0100 Subject: [PATCH] add wasm to util and update versions --- gradle.properties | 3 +++ gradle/libs.versions.toml | 4 ++-- util/build.gradle.kts | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index b0f3e3a..97a9c18 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,6 +11,9 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 #Compose org.jetbrains.compose.experimental.uikit.enabled=true +org.jetbrains.compose.experimental.jscanvas.enabled=true +org.jetbrains.compose.experimental.macos.enabled=true +org.jetbrains.compose.experimental.wasm.enabled=true #Android android.useAndroidX=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 002de6a..a245bfe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,9 +10,9 @@ android-minSdk = "26" android-targetSdk = "33" barcodeScanning = "17.2.0" cameraX = "1.3.0" -compose = "1.5.11" +compose = "1.6.0-alpha01" # @keep -compose-extensions = "1.5.11.0" +compose-extensions = "1.6.0-alpha01.0" gradle-versions = "0.49.0" # @pin kotlin = "1.9.21" diff --git a/util/build.gradle.kts b/util/build.gradle.kts index 48b2b39..8bb35de 100644 --- a/util/build.gradle.kts +++ b/util/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { alias(libs.plugins.kotlin.multiplatform) apply true alias(libs.plugins.android.library) apply true @@ -25,6 +27,11 @@ kotlin { iosArm64() iosSimulatorArm64() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + d8() + } + applyDefaultHierarchyTemplate() sourceSets {