Merge pull request #506 from icerockdev/#460-kotlin-1820-for-js

#460 kotlin 1820 for js

Author: Alex009

README.md

@@ -62,7 +62,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.22.3"
+        classpath "dev.icerock.moko:resources-generator:0.23.0"
     }
 }
 
@@ -80,10 +80,10 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.22.3")
-    commonMainApi("dev.icerock.moko:resources-compose:0.22.3") // for compose multiplatform
+    commonMainApi("dev.icerock.moko:resources:0.23.0")
+    commonMainApi("dev.icerock.moko:resources-compose:0.23.0") // for compose multiplatform
 
-    commonTestImplementation("dev.icerock.moko:resources-test:0.22.3")
+    commonTestImplementation("dev.icerock.moko:resources-test:0.23.0")
 }
 
 multiplatformResources {
@@ -102,7 +102,7 @@ should [add `export` declarations](https://kotlinlang.org/docs/multiplatform-bui
 
 ```
 framework {
-    export("dev.icerock.moko:resources:0.22.3")
+    export("dev.icerock.moko:resources:0.23.0")
     export("dev.icerock.moko:graphics:0.9.0") // toUIColor here
 }
 ```
@@ -629,6 +629,15 @@ with compose you can just call in `commonMain`
 val fontFamily: FontFamily = fontFamilyResource(MR.fonts.Raleway.italic)
 ```
 
+or you can get `Font`
+
+```kotlin
+val font: Font = MR.fonts.Raleway.italic.asFont(
+  weight = FontWeight.Normal, // optional
+  style = FontStyle.Normal // optional
+)
+```
+
 ### Example 9 - pass colors
 
 Colors resources directory is `commonMain/resources/MR/colors`.  

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/LanguageType.kt

@@ -30,7 +30,7 @@ sealed interface LanguageType {
         override val androidResourcesDir: String = buildString {
             append("values")
             append("-")
-            append(jvmLocale.language)
+            append(jvmLocale.getISO639Language())
             if (jvmLocale.country.isNotBlank()) {
                 append("-r")
                 append(jvmLocale.country)
@@ -54,6 +54,22 @@ sealed interface LanguageType {
         override fun equals(other: Any?): Boolean {
             return other is Locale && other.jvmLocale == jvmLocale
         }
+
+        /**
+         * For android we should use ISO-639-1 language code
+         * https://developer.android.com/guide/topics/resources/providing-resources
+         * https://github.com/icerockdev/moko-resources/issues/468
+         *
+         * @see java.util.Locale#convertOldISOCodes
+         */
+        private fun JvmLocale.getISO639Language(): String {
+            return when (language) {
+                "he" -> "iw"
+                "yi" -> "ji"
+                "id" -> "in"
+                else -> language
+            }
+        }
     }
 
     companion object {

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/apple/AppleMRGenerator.kt

@@ -97,7 +97,12 @@ class AppleMRGenerator(
         setupTestsResources()
         setupFatFrameworkTasks()
 
-        dependsOnProcessResources(project, sourceSet, generationTask)
+        dependsOnProcessResources(
+            project = project,
+            sourceSet = sourceSet,
+            task = generationTask,
+            shouldExcludeGenerated = true
+        )
     }
 
     override fun beforeMRGeneration() {

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/js/JsMRGenerator.kt

@@ -95,31 +95,40 @@ class JsMRGenerator(
             it.dependsOn(generationTask)
         }
 
-        dependsOnProcessResources(project, sourceSet, generationTask)
+        dependsOnProcessResources(
+            project = project,
+            sourceSet = sourceSet,
+            task = generationTask,
+            shouldExcludeGenerated = true
+        )
     }
 
     private fun setupKLibResources(generationTask: Task) {
-        val compileTask: Kotlin2JsCompile = compilation.compileKotlinTask
-        compileTask.dependsOn(generationTask)
-
-        @Suppress("UNCHECKED_CAST")
-        compileTask.doLast(CopyResourcesToKLibAction(resourcesGenerationDir) as Action<in Task>)
+        val taskProvider = compilation.compileTaskProvider
+        taskProvider.configure { compileTask ->
+            compileTask.dependsOn(generationTask)
+            val action = CopyResourcesToKLibAction(resourcesGenerationDir)
+            @Suppress("UNCHECKED_CAST")
+            compileTask.doLast(action as Action<in Task>)
+        }
     }
 
     private fun setupResources() {
-        val kotlinTarget = compilation.target as KotlinJsIrTarget
+        val kotlinTarget: KotlinJsIrTarget = compilation.target as KotlinJsIrTarget
 
         kotlinTarget.compilations
-            .map { it.compileKotlinTask }
-            .forEach { compileTask ->
-                @Suppress("UNCHECKED_CAST")
-                compileTask.doLast(CopyResourcesToExecutableAction(resourcesGenerationDir) as Action<in Task>)
+            .configureEach { compilation ->
+                compilation.compileTaskProvider.configure { compileTask ->
+                    val action = CopyResourcesToExecutableAction(resourcesGenerationDir)
+                    @Suppress("UNCHECKED_CAST")
+                    compileTask.doLast(action as Action<in Task>)
+                }
             }
     }
 
     class CopyResourcesToKLibAction(private val resourcesDir: File) : Action<Kotlin2JsCompile> {
         override fun execute(task: Kotlin2JsCompile) {
-            val unpackedKLibDir: File = task.outputFileProperty.get()
+            val unpackedKLibDir: File = task.destinationDirectory.asFile.get()
             val defaultDir = File(unpackedKLibDir, "default")
             val resRepackDir = File(defaultDir, "resources")
             if (resRepackDir.exists().not()) return

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmMRGenerator.kt

@@ -79,7 +79,12 @@ class JvmMRGenerator(
             it.exclude("MR/**")
             it.dependsOn(generationTask)
         }
-        dependsOnProcessResources(project, sourceSet, generationTask)
+        dependsOnProcessResources(
+            project = project,
+            sourceSet = sourceSet,
+            task = generationTask,
+            shouldExcludeGenerated = false
+        )
     }
 
     companion object {

resources-generator/src/main/kotlin/dev/icerock/gradle/utils/ProcessResourcesUtils.kt

@@ -7,11 +7,25 @@ package dev.icerock.gradle.utils
 import dev.icerock.gradle.generator.MRGenerator
 import org.gradle.api.Project
 import org.gradle.api.Task
+import org.gradle.kotlin.dsl.withType
+import org.gradle.language.jvm.tasks.ProcessResources
 
-fun dependsOnProcessResources(project: Project, sourceSet: MRGenerator.SourceSet, task: Task) {
+fun dependsOnProcessResources(
+    project: Project,
+    sourceSet: MRGenerator.SourceSet,
+    task: Task,
+    shouldExcludeGenerated: Boolean
+) {
     project.tasks
         .matching { it.name == sourceSet.name.removeSuffix("Main") + "ProcessResources" }
-        .configureEach {
-            it.dependsOn(task)
+        .withType<ProcessResources>()
+        .configureEach { processResourcesTask ->
+            processResourcesTask.exclude {
+                val path: String = it.file.absolutePath
+                if (shouldExcludeGenerated && path.contains("generated/moko")) return@exclude true
+                if (path.contains("resources/MR")) return@exclude true
+                false
+            }
+            processResourcesTask.dependsOn(task)
         }
 }

samples/compose-resources-gallery/gradle.properties

@@ -14,6 +14,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=1.8.10
+kotlin.version=1.8.20
 agp.version=8.0.1
 compose.version=1.4.0