Sort generated resource accessor properties to be stable

JetBrains · Nov 30, 2023 · 3655935 · 3655935
1 parent 09bd7d5
commit 3655935
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ResourcesSpec.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ResourcesSpec.kt
@@ -48,16 +48,18 @@ internal fun getResFileSpec(
         addModifiers(KModifier.INTERNAL)
         val types = resources.map { (type, idToResources) ->
             getResourceTypeObject(type, idToResources)
-        }
+        }.sortedBy { it.name }
         addTypes(types)
     }.build())
 }.build()
 
 private fun getResourceTypeObject(type: ResourceType, nameToResources: Map<String, List<ResourceItem>>) =
     TypeSpec.objectBuilder(type.typeName).apply {
-        nameToResources.forEach { (name, items) ->
-            addResourceProperty(name, items)
-        }
+        nameToResources.entries
+            .sortedBy { it.key }
+            .forEach { (name, items) ->
+                addResourceProperty(name, items.sortedBy { it.name })
+            }
     }.build()
 
 private fun TypeSpec.Builder.addResourceProperty(name: String, items: List<ResourceItem>) {

diff --git a/gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Res.kt b/gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Res.kt
@@ -6,6 +6,15 @@ import org.jetbrains.compose.resources.ResourceItem
 import org.jetbrains.compose.resources.StringResource
 
 internal object Res {
+    public object fonts {
+        public val emptyfont: FontResource = FontResource(
+            "FONT:emptyfont",
+            setOf(
+                ResourceItem(setOf(), "composeRes/fonts/emptyFont.otf"),
+            )
+        )
+    }
+
     public object images {
         public val vector: ImageResource = ImageResource(
             "IMAGE:vector",
@@ -47,28 +56,19 @@ internal object Res {
             )
         )
 
-        public val str_template: StringResource = StringResource(
-            "STRING:str_template",
-            "str_template",
-            setOf(
-                ResourceItem(setOf(), "composeRes/values/strings.xml"),
-            )
-        )
-
         public val str_arr: StringResource = StringResource(
             "STRING:str_arr",
             "str_arr",
             setOf(
                 ResourceItem(setOf(), "composeRes/values/strings.xml"),
             )
         )
-    }
 
-    public object fonts {
-        public val emptyfont: FontResource = FontResource(
-            "FONT:emptyfont",
+        public val str_template: StringResource = StringResource(
+            "STRING:str_template",
+            "str_template",
             setOf(
-                ResourceItem(setOf(), "composeRes/fonts/emptyFont.otf"),
+                ResourceItem(setOf(), "composeRes/values/strings.xml"),
             )
         )
     }