Merge branch 'develop' into extractingToTemp-fix

Author: Alex009

.gitignore

@@ -12,3 +12,4 @@ local.properties
 local.gradle
 moko-resources-generated.js
 .fleet
+.kotlin

gradle.properties

@@ -13,6 +13,7 @@ kotlin.mpp.enableCInteropCommonization=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.uikit.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true
+org.jetbrains.compose.experimental.wasm.enabled=true
 
 android.useAndroidX=true
 

gradle/libs.versions.toml

@@ -1,20 +1,21 @@
 [versions]
-kotlinVersion = "1.9.20"
+kotlinVersion = "1.9.25"
 androidGradleVersion = "8.1.4"
 androidSdkCommonVersion = "31.1.2"
 
 # kotlinx
 kotlinxSerializationVersion = "1.6.1"
-kotlinxCoroutinesVersion = "1.6.4"
+kotlinxCoroutinesVersion = "1.8.0"
+kotlinxBrowserVersion = "0.3"
 
 # android
 androidAppCompatVersion = "1.6.1"
 
 # android compose
-composeUiVersion = "1.5.1"
+composeUiVersion = "1.7.1"
 
 # jetbrains compose
-composeJetbrainsVersion = "1.6.0"
+composeJetbrainsVersion = "1.7.0"
 
 # jvm
 apacheCommonsTextVersion = "1.10.0"
@@ -25,14 +26,15 @@ commonsCodecVersion = "1.15"
 batikVersion = "1.17"
 
 # moko
-mokoGraphicsVersion = "0.9.0"
+mokoGraphicsVersion = "0.10.0"
 mokoTestVersion = "0.6.1"
 mokoMultiplatformPluginVersion = "0.14.2"
 
 [libraries]
 # kotlinx
 kotlinxSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationVersion" }
 kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesVersion" }
+kotlinxBrowser = { module = "org.jetbrains.kotlinx:kotlinx-browser", version.ref = "kotlinxBrowserVersion" }
 
 # moko
 mokoGraphics = { module = "dev.icerock.moko:graphics", version.ref = "mokoGraphicsVersion" }

gradle/moko.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-resourcesVersion = "0.24.5"
+resourcesVersion = "0.25.0"
 
 [libraries]
 resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }

kotlin-js-store/yarn.lock

@@ -24,6 +24,21 @@ kotlin {
         browser()
         useCommonJs()
     }
+    wasmJs {
+        browser()
+        useCommonJs()
+    }
+
+    // For https://youtrack.jetbrains.com/issue/KT-61573
+    targets.configureEach {
+        compilations.configureEach {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    freeCompilerArgs.add("-Xexpect-actual-classes")
+                }
+            }
+        }
+    }
 
     sourceSets {
         val commonMain by getting
@@ -57,6 +72,16 @@ kotlin {
             macosX64Main.dependsOn(this)
         }
 
+        val commonJsMain = create("commonJsMain") {
+            dependsOn(commonMain)
+        }
+        val jsMain by getting {
+            dependsOn(commonJsMain)
+        }
+        val wasmJsMain by getting {
+            dependsOn(commonJsMain)
+        }
+
         val commonTest by getting
         val macosArm64Test by getting
         val macosX64Test by getting
@@ -70,6 +95,10 @@ kotlin {
         val jsTest by getting {
             dependsOn(commonTest)
         }
+
+        val wasmJsTest by getting {
+            dependsOn(commonTest)
+        }
     }
 
     jvmToolchain(11)

resources-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts

@@ -34,6 +34,9 @@ kotlin {
     js(IR) {
         browser()
     }
+    wasmJs {
+        browser()
+    }
 
     sourceSets {
         commonMain {

resources-compose/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2025 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package dev.icerock.moko.resources.compose