azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure to sort klib manifest data

Browse Source 
Not sorting results in non reproducible output causing up-to-date check failures
This commit is contained in:
Aurimas
2022-06-10 15:43:00 -07:00
committed by Space
parent 481607df43
commit e2ac24cc90
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/NativeSensitiveManifestData.kt
+5 -2
View File
@@ -50,12 +50,15 @@ fun BaseWriterImpl.addManifest(manifest: NativeSensitiveManifestData) {
manifestProperties[KLIB_PROPERTY_UNIQUE_NAME] = manifest.uniqueName
// note: versions can't be added here
// Make sure all the lists are sorted for reproducible output
addOptionalProperty(KLIB_PROPERTY_DEPENDS, manifest.dependencies.isNotEmpty()) { manifest.dependencies.joinToString(separator = " ") }
addOptionalProperty(KLIB_PROPERTY_DEPENDS, manifest.dependencies.isNotEmpty()) {
manifest.dependencies.sorted().joinToString(separator = " ")
}
addOptionalProperty(KLIB_PROPERTY_INTEROP, manifest.isInterop) { "true" }
addOptionalProperty(KLIB_PROPERTY_PACKAGE, manifest.packageFqName != null) { manifest.packageFqName!! }
addOptionalProperty(KLIB_PROPERTY_EXPORT_FORWARD_DECLARATIONS, manifest.exportForwardDeclarations.isNotEmpty() || manifest.isInterop) {
manifest.exportForwardDeclarations.joinToString(" ")
manifest.exportForwardDeclarations.sorted().joinToString(" ")
}
addOptionalProperty(KLIB_PROPERTY_NATIVE_TARGETS, manifest.nativeTargets.isNotEmpty()) {