[ABI Validation] Sort class signatures before dump the same way Kotli…

…nApiBuildTask does Pull request Kotlin/binary-compatibility-validator#188
JetBrains · Oct 22, 2024 · 1fe8287 · 1fe8287
1 parent aed3735
commit 1fe8287
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/libraries/tools/abi-validation/src/main/kotlin/KotlinApiBuildTask.kt b/libraries/tools/abi-validation/src/main/kotlin/KotlinApiBuildTask.kt
@@ -105,15 +105,7 @@ public open class KotlinApiBuildTask @Inject constructor(
             .filterOutAnnotated(nonPublicMarkers.map(::replaceDots).toSet())
 
         outputApiDir.resolve("$projectName.api").bufferedWriter().use { writer ->
-            filteredSignatures
-                .sortedBy { it.name }
-                .forEach { api ->
-                    writer.append(api.signature).appendLine(" {")
-                    api.memberSignatures
-                        .sortedWith(MEMBER_SORT_ORDER)
-                        .forEach { writer.append("\t").appendLine(it.signature) }
-                    writer.appendLine("}\n")
-                }
+            filteredSignatures.dump(writer)
         }
     }
 

diff --git a/libraries/tools/abi-validation/src/main/kotlin/api/KotlinSignaturesLoading.kt b/libraries/tools/abi-validation/src/main/kotlin/api/KotlinSignaturesLoading.kt
@@ -313,15 +313,16 @@ public fun List<ClassBinarySignature>.dump(): PrintStream = dump(to = System.out
 
 @ExternalApi
 public fun <T : Appendable> List<ClassBinarySignature>.dump(to: T): T {
-    forEach { classApi ->
-        with(to) {
-            append(classApi.signature).appendLine(" {")
-            classApi.memberSignatures
-                .sortedWith(MEMBER_SORT_ORDER)
-                .forEach { append("\t").appendLine(it.signature) }
-            appendLine("}\n")
+    sortedBy { it.name }
+        .forEach { classApi ->
+            with(to) {
+                append(classApi.signature).appendLine(" {")
+                classApi.memberSignatures
+                    .sortedWith(MEMBER_SORT_ORDER)
+                    .forEach { append("\t").appendLine(it.signature) }
+                appendLine("}\n")
+            }
         }
-    }
     return to
 }