Merge pull request #137 from icerockdev/develop

Release 0.13.2

Author: Alex009

README.md

@@ -1,5 +1,5 @@
 ![moko-resources](img/logo.png)  
-[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://api.bintray.com/packages/icerockdev/moko/moko-resources/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-resources/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.0-orange)
+[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://api.bintray.com/packages/icerockdev/moko/moko-resources/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-resources/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.21-orange)
 
 # Mobile Kotlin resources
 This is a Kotlin MultiPlatform library that provides access to the resources on iOS & Android with the support of the default system localization.
@@ -52,6 +52,8 @@ This is a Kotlin MultiPlatform library that provides access to the resources on
 - kotlin 1.4.0
   - 0.13.0
   - 0.13.1
+- kotlin 1.4.21
+  - 0.13.2
 
 ## Installation
 root build.gradle  
@@ -62,7 +64,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.13.1"
+        classpath "dev.icerock.moko:resources-generator:0.13.2"
     }
 }
 
@@ -79,7 +81,7 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.13.1")
+    commonMainApi("dev.icerock.moko:resources:0.13.2")
 }
 
 multiplatformResources {

buildSrc/build.gradle.kts

@@ -3,20 +3,18 @@
  */
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version("1.4.0")
+    id("org.jetbrains.kotlin.jvm") version("1.4.21")
 }
 
 repositories {
-    mavenLocal()
-
     jcenter()
     google()
 
     maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.7.0")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
+    implementation("dev.icerock:mobile-multiplatform:0.9.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
     implementation("com.android.tools.build:gradle:4.0.1")
 }

buildSrc/src/main/kotlin/Deps.kt

@@ -3,7 +3,7 @@
  */
 
 object Deps {
-    private const val kotlinVersion = "1.4.0"
+    private const val kotlinVersion = "1.4.21"
     private const val androidGradleVersion = "4.0.1"
 
     private const val androidAppCompatVersion = "1.1.0"
@@ -13,13 +13,13 @@ object Deps {
 
     private const val apacheCommonsTextVersion = "1.3"
     private const val kotlinPoetVersion = "1.6.0"
-    private const val kotlinxSerializationVersion = "0.20.0"
+    private const val kotlinxSerializationVersion = "1.0.0"
 
     private const val detektVersion = "1.7.4"
 
-    private const val mokoGraphicsVersion = "0.4.0"
-    private const val mokoParcelizeVersion = "0.4.0"
-    const val mokoResourcesVersion = "0.13.1"
+    private const val mokoGraphicsVersion = "0.5.0"
+    private const val mokoParcelizeVersion = "0.5.0"
+    const val mokoResourcesVersion = "0.13.2"
 
     object Android {
         const val compileSdk = 28
@@ -79,11 +79,8 @@ object Deps {
         object MultiPlatform {
             const val mokoResources = "dev.icerock.moko:resources:$mokoResourcesVersion"
             const val mokoParcelize = "dev.icerock.moko:parcelize:$mokoParcelizeVersion"
-            val mokoGraphics = MultiPlatformLibrary(
-                common = "dev.icerock.moko:graphics:$mokoGraphicsVersion",
-                iosX64 = "dev.icerock.moko:graphics-iosx64:$mokoGraphicsVersion",
-                iosArm64 = "dev.icerock.moko:graphics-iosarm64:$mokoGraphicsVersion"
-            )
+            val mokoGraphics = "dev.icerock.moko:graphics:$mokoGraphicsVersion"
+                .defaultMPL(ios = true)
 
             object Tests {
                 const val kotlinTest =
@@ -97,7 +94,7 @@ object Deps {
             const val kotlinPoet =
                 "com.squareup:kotlinpoet:$kotlinPoetVersion"
             const val kotlinxSerialization =
-                "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlinxSerializationVersion"
+                "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationVersion"
             const val apacheCommonsText =
                 "org.apache.commons:commons-text:$apacheCommonsTextVersion"
             const val detektFormatting =

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -74,7 +74,10 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
         val androidPackage = getAndroidPackage(manifestFile)
 
         val generatedDir = File(target.buildDir, "generated/moko")
-        val mrClassPackage: String = requireNotNull(mrExtension.multiplatformResourcesPackage)
+        val mrClassPackage: String = requireNotNull(mrExtension.multiplatformResourcesPackage) {
+            "multiplatformResources.multiplatformResourcesPackage is required!" +
+                    " please configure moko-resources plugin correctly."
+        }
         val sourceInfo = SourceInfo(
             generatedDir,
             commonResources,

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

@@ -78,9 +78,10 @@ abstract class ColorsGenerator(
         fun getColor(color: String?): String? {
             return if (color?.startsWith(XmlColorReferencePrefix) == true) {
                 val colorName = color.replace(XmlColorReferencePrefix, "")
-                colorValues[colorName]
+                val colorValue = colorValues[colorName]
+                getColor(colorValue)
             } else {
-                color
+                color?.removePrefix("#")?.removePrefix("0x")
             }
         }
 
@@ -109,9 +110,7 @@ abstract class ColorsGenerator(
                         else -> {
                             singleColor = xmlNode.textContent
                             singleColor?.let {
-                                if (!it.startsWith(XmlColorReferencePrefix)) {
-                                    colorValues[colorName] = it
-                                }
+                                colorValues[colorName] = it
                             }
                         }
                     }

plugins/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/ios/IosColorsGenerator.kt

@@ -13,8 +13,9 @@ import dev.icerock.gradle.generator.ios.IosMRGenerator.Companion.ASSETS_DIR_NAME
 import dev.icerock.gradle.utils.ArgbColor
 import dev.icerock.gradle.utils.parseRgbaColor
 import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.json
-import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
 import org.gradle.api.file.FileTree
 import java.io.File
 
@@ -43,6 +44,7 @@ class IosColorsGenerator(
             val colorContentObj = if (colorNode.isThemed()) {
                 @Suppress("MagicNumber")
                 val lightColor = parseRgbaColor(colorNode.lightColor!!.toLong(16))
+
                 @Suppress("MagicNumber")
                 val darkColor = parseRgbaColor(colorNode.darkColor!!.toLong(16))
 
@@ -54,53 +56,55 @@ class IosColorsGenerator(
                 val lightColorObj = buildAppearancesIdiomJsonBlock("light", lightColor)
                 val darkColorObj = buildAppearancesIdiomJsonBlock("dark", darkColor)
 
-                jsonArray {
-                    +anyColor
-                    +lightColorObj
-                    +darkColorObj
+                buildJsonArray {
+                    add(anyColor)
+                    add(lightColorObj)
+                    add(darkColorObj)
                 }
             } else {
                 @Suppress("MagicNumber")
                 val singleColor = parseRgbaColor(colorNode.singleColor!!.toLong(16))
-                jsonArray { +buildColorIdiomJsonObj(singleColor) }
+                buildJsonArray {
+                    add(buildColorIdiomJsonObj(singleColor))
+                }
             }
 
-            val resultObj = json {
-                "colors" to colorContentObj
-                "info" to json {
-                    "author" to "xcode"
-                    "version" to 1
-                }
+            val resultObj = buildJsonObject {
+                put("colors", colorContentObj)
+                put("info", buildJsonObject {
+                    put("author", "xcode")
+                    put("version", 1)
+                })
             }
             contentsFile.writeText(resultObj.toString())
         }
     }
 
-    private fun buildColorJsonObj(argbColor: ArgbColor): JsonObject = json {
-        "color-space" to "srgb"
-        "components" to json {
-            "alpha" to argbColor.a
-            "red" to argbColor.r
-            "green" to argbColor.g
-            "blue" to argbColor.b
-        }
+    private fun buildColorJsonObj(argbColor: ArgbColor): JsonObject = buildJsonObject {
+        put("color-space", "srgb")
+        put("components", buildJsonObject {
+            put("alpha", argbColor.a)
+            put("red", argbColor.r)
+            put("green", argbColor.g)
+            put("blue", argbColor.b)
+        })
     }
 
-    private fun buildColorIdiomJsonObj(argbColor: ArgbColor): JsonObject = json {
-        "color" to buildColorJsonObj(argbColor)
-        "idiom" to "universal"
+    private fun buildColorIdiomJsonObj(argbColor: ArgbColor): JsonObject = buildJsonObject {
+        put("color", buildColorJsonObj(argbColor))
+        put("idiom", "universal")
     }
 
     private fun buildAppearancesIdiomJsonBlock(valueTag: String, argbColor: ArgbColor): JsonObject {
-        return json {
-            "appearances" to jsonArray {
-                +json {
-                    "appearance" to "luminosity"
-                    "value" to valueTag
-                }
-            }
-            "color" to buildColorJsonObj(argbColor)
-            "idiom" to "universal"
+        return buildJsonObject {
+            put("appearances", buildJsonArray {
+                add(buildJsonObject {
+                    put("appearance", "luminosity")
+                    put("value", valueTag)
+                })
+            })
+            put("color", buildColorJsonObj(argbColor))
+            put("idiom", "universal")
         }
     }
 }

resources/src/commonMain/kotlin/dev/icerock/moko/resources/StringResource.kt

@@ -9,5 +9,6 @@ import dev.icerock.moko.resources.desc.StringDesc
 
 expect class StringResource
 
-fun StringResource.format(vararg args: Any) = StringDesc.ResourceFormatted(this, args)
+@Suppress("SpreadOperator")
+fun StringResource.format(vararg args: Any) = StringDesc.ResourceFormatted(this, *args)
 fun StringResource.format(args: List<Any>) = StringDesc.ResourceFormatted(this, args)

sample/android-app/src/androidTest/java/com/icerockdev/StringResourcesTestEn.kt

@@ -15,9 +15,7 @@ class StringResourcesTestEn : StringResourcesTest() {
     override val locale: String = "en"
 
     override val stringAndPluralsCheck: String
-        get() = "test\ntest 2\ntest 3\nTest Project\nsome raw string\nother\none\nother\nother"
-    // commented while not fix https://youtrack.jetbrains.com/issue/KT-41384
-    // \nnested test"
+        get() = "test\ntest 2\ntest 3\nTest Project\nsome raw string\nother\none\nother\nother\nnested test"
 
     override val stringDescsCheck: String
         get() = "test\ntest\nTest data 9\nother\nother\n10 items\nraw string\nraw string" +

sample/android-app/src/androidTest/java/com/icerockdev/StringResourcesTestRu.kt

@@ -15,9 +15,7 @@ class StringResourcesTestRu : StringResourcesTest() {
     override val locale: String = "ru"
 
     override val stringAndPluralsCheck: String
-        get() = "тест\nтест 2\nтест 3\nТестовый проект\nsome raw string\nмного\nодин\nнесколько\nнесколько"
-    // commented while not fix https://youtrack.jetbrains.com/issue/KT-41384
-    // \nтест вложенный"
+        get() = "тест\nтест 2\nтест 3\nТестовый проект\nsome raw string\nмного\nодин\nнесколько\nнесколько\nтест вложенный"
 
     override val stringDescsCheck: String
         get() = "тест\nтест\nТестовые данные 9\nмного\nмного\n10 элементов\nraw string\nraw string\n" +