Release 0.25.0

.gitignore

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

README.md

@@ -8,6 +8,7 @@
 ![badge][badge-macosX64]
 ![badge][badge-jvm]
 ![badge][badge-js]
+![badge][badge-wasmjs]
 
 # Mobile Kotlin resources
 
@@ -64,7 +65,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.24.5"
+        classpath "dev.icerock.moko:resources-generator:0.25.0"
     }
 }
 
@@ -82,10 +83,10 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.24.5")
-    commonMainApi("dev.icerock.moko:resources-compose:0.24.5") // for compose multiplatform
+    commonMainApi("dev.icerock.moko:resources:0.25.0")
+    commonMainApi("dev.icerock.moko:resources-compose:0.25.0") // for compose multiplatform
 
-    commonTestImplementation("dev.icerock.moko:resources-test:0.24.5")
+    commonTestImplementation("dev.icerock.moko:resources-test:0.25.0")
 }
 
 multiplatformResources {
@@ -132,7 +133,7 @@ should [add `export` declarations](https://kotlinlang.org/docs/multiplatform-bui
 
 ```
 framework {
-    export("dev.icerock.moko:resources:0.24.5")
+    export("dev.icerock.moko:resources:0.25.0")
     export("dev.icerock.moko:graphics:0.9.0") // toUIColor here
 }
 ```

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" }

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

@@ -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-compose/build.gradle.kts

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

resources-compose/src/iosMain/kotlin/dev/icerock/moko/resources/compose/FontResource.ios.kt → resources-compose/src/appleMain/kotlin/dev/icerock/moko/resources/compose/FontResource.kt

@@ -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

resources-compose/src/jsMain/kotlin/dev/icerock/moko/resources/compose/FontResource.js.kt → resources-compose/src/commonJsMain/kotlin/dev/icerock/moko/resources/compose/FontResource.kt

@@ -21,7 +21,7 @@ actual fun FontResource.asFont(
 ): Font? {
     val bytes: ByteArray? by produceByteArray(url = fileUrl)
 
-    return remember(fileUrl, bytes?.size ?: 0) {
+    return remember(bytes, weight, style) {
         bytes?.let { b ->
             Font(
                 identity = fontFamily,

resources-compose/src/jsMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt → resources-compose/src/commonJsMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt

@@ -5,9 +5,9 @@
 package dev.icerock.moko.resources.compose
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.LocalSystemTheme
 import androidx.compose.ui.SystemTheme
 import androidx.compose.ui.graphics.Color
@@ -25,7 +25,7 @@ import org.jetbrains.skia.Data
 import org.jetbrains.skia.Image
 import org.jetbrains.skia.svg.SVGDOM
 
-@OptIn(InternalComposeApi::class)
+@OptIn(InternalComposeUiApi::class)
 @Composable
 actual fun painterResource(imageResource: ImageResource): Painter {
     val fileUrl: String = if (LocalSystemTheme.current == SystemTheme.Dark) {

resources-compose/src/jsMain/kotlin/dev/icerock/moko/resources/compose/StringResource.kt → resources-compose/src/commonJsMain/kotlin/dev/icerock/moko/resources/compose/StringResource.kt

@@ -48,7 +48,7 @@ actual fun stringResource(resource: PluralsResource, quantity: Int, vararg args:
 }
 
 @Composable
-private fun localized(stringDesc: StringDesc): String {
+internal fun localized(stringDesc: StringDesc): String {
     return produceState(initialValue = "", stringDesc) {
         value = stringDesc.toLocalizedString()
     }.value

resources-compose/src/commonJsMain/kotlin/dev/icerock/moko/resources/compose/internal/Platform.commonJs.kt

@@ -0,0 +1,7 @@
+/*
+ * Copyright 2025 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources.compose.internal
+
+internal expect suspend fun fetchByteArray(url: String): ByteArray

resources-compose/src/commonJsMain/kotlin/dev/icerock/moko/resources/compose/internal/produceByteArray.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2023 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:Suppress("Filename")
+
+package dev.icerock.moko.resources.compose.internal
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.produceState
+
+@Composable
+internal fun produceByteArray(url: String): State<ByteArray?> {
+    return produceState<ByteArray?>(null, url) {
+        @Suppress("TooGenericExceptionCaught")
+        try {
+            value = fetchByteArray(url)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+}

resources-compose/src/iosMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt

@@ -5,8 +5,8 @@
 package dev.icerock.moko.resources.compose
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.remember
+import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.LocalSystemTheme
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
@@ -18,7 +18,7 @@ import org.jetbrains.skia.Image
 import platform.CoreGraphics.CGImageRef
 import platform.UIKit.UIImage
 
-@OptIn(ExperimentalForeignApi::class, InternalComposeApi::class)
+@OptIn(ExperimentalForeignApi::class, InternalComposeUiApi::class)
 @Composable
 actual fun painterResource(imageResource: ImageResource): Painter {
     return remember(LocalSystemTheme.current, imageResource) {

resources-compose/src/jsMain/kotlin/dev/icerock/moko/resources/compose/internal/Platform.js.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2025 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources.compose.internal
+
+import kotlinx.browser.window
+import kotlinx.coroutines.await
+import org.khronos.webgl.ArrayBuffer
+import org.khronos.webgl.Int8Array
+import org.w3c.fetch.Response
+
+internal actual suspend fun fetchByteArray(url: String): ByteArray {
+    val response: Response = window.fetch(url).await()
+
+    if (response.ok.not()) {
+        error("can't load data from $url : $response")
+    }
+
+    val buffer: ArrayBuffer = response.arrayBuffer().await()
+
+    return Int8Array(buffer).unsafeCast<ByteArray>()
+}

resources-compose/src/jvmMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt

@@ -5,14 +5,14 @@
 package dev.icerock.moko.resources.compose
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.InternalComposeApi
+import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.LocalSystemTheme
 import androidx.compose.ui.SystemTheme
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import dev.icerock.moko.resources.ImageResource
 
-@OptIn(InternalComposeApi::class)
+@OptIn(InternalComposeUiApi::class)
 @Composable
 actual fun painterResource(imageResource: ImageResource): Painter {
     val filePath: String = if (LocalSystemTheme.current == SystemTheme.Dark) {

resources-compose/src/macosMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt

@@ -5,8 +5,8 @@
 package dev.icerock.moko.resources.compose
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.remember
+import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.LocalSystemTheme
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
@@ -19,7 +19,7 @@ import platform.AppKit.NSImage
 import platform.CoreGraphics.CGImageRef
 import platform.CoreGraphics.CGImageRelease
 
-@OptIn(ExperimentalForeignApi::class, InternalComposeApi::class)
+@OptIn(ExperimentalForeignApi::class, InternalComposeUiApi::class)
 @Composable
 actual fun painterResource(imageResource: ImageResource): Painter {
     return remember(LocalSystemTheme.current, imageResource) {