Merge pull request #877 from icerockdev/develop

Release 0.26.4

Author: Alex009

README.md

@@ -65,7 +65,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.26.3"
+        classpath "dev.icerock.moko:resources-generator:0.26.4"
     }
 }
 
@@ -83,10 +83,10 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.26.3")
-    commonMainApi("dev.icerock.moko:resources-compose:0.26.3") // for compose multiplatform
+    commonMainApi("dev.icerock.moko:resources:0.26.4")
+    commonMainApi("dev.icerock.moko:resources-compose:0.26.4") // for compose multiplatform
 
-    commonTestImplementation("dev.icerock.moko:resources-test:0.26.3")
+    commonTestImplementation("dev.icerock.moko:resources-test:0.26.4")
 }
 
 multiplatformResources {
@@ -133,7 +133,7 @@ should [add `export` declarations](https://kotlinlang.org/docs/multiplatform-bui
 
 ```
 framework {
-    export("dev.icerock.moko:resources:0.26.3")
+    export("dev.icerock.moko:resources:0.26.4")
     export("dev.icerock.moko:graphics:0.10.0") // toUIColor here
 }
 ```

gradle/moko.versions.toml

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

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

@@ -37,7 +37,9 @@ internal class ResourceTypeGenerator<T : ResourceMetadata>(
         parentObjectName: String,
         resources: List<ResourceMetadata>,
     ): GenerationResult? {
-        val typeMetadata: List<T> = resources.filterClass(typeClass = metadataClass)
+        val typeMetadata: List<T> = resources
+            .filterClass(typeClass = metadataClass)
+            .sortedBy { it.key }
 
         // if we not have any resources of our type at all - not generate object
         if (typeMetadata.isEmpty()) return null
@@ -128,7 +130,9 @@ internal class ResourceTypeGenerator<T : ResourceMetadata>(
         parentObjectName: String,
         resources: List<ResourceMetadata>,
     ): GenerationResult? {
-        val typeResources: List<T> = resources.filterClass(metadataClass)
+        val typeResources: List<T> = resources
+            .filterClass(typeClass = metadataClass)
+            .sortedBy { it.key }
 
         // if we not have any resources of our type at all - not generate object
         if (typeResources.isEmpty()) return null