Merge pull request #106 from smartmobilefactory/feature/STRMAC-1858

Tomusm · web-flow · commit c4f20ff0c5d2 · 2020-05-07T13:52:17.000+02:00
Plist2swift: Make sure to sort allKeyValueTuples to ensure consistent ordering
diff --git a/Plist2swift/Sources/Plist2.swift b/Plist2swift/Sources/Plist2.swift
@@ -109,7 +109,7 @@ private func isKeyAvailableInAllPlists(keyToSearch: String, tupleKey: String, tu
 	return true
 }
 
-private func generateProtocol(tuplesForPlists: [String: KeyValueTuples], allKeyValueTuples: [String: KeyValueTuples]) -> [String: [String: String]] {
+private func generateProtocol(tuplesForPlists: [String: KeyValueTuples], allKeyValueTuples: [(String, KeyValueTuples)]) -> [String: [String: String]] {
 	var dictionaryWithOptionalValues = [String: [String: String]]()
 	for (tupleKey, tuples) in allKeyValueTuples {
 
@@ -659,6 +659,7 @@ for plistPath in plists {
 	}
 }
 
-let optionalDictionary = generateProtocol(tuplesForPlists: tuplesForPlists, allKeyValueTuples: allKeyValueTuples)
+let allKeyValueTuplesSorted = allKeyValueTuples.sorted(by: { $0.0 < $1.0 })
+let optionalDictionary = generateProtocol(tuplesForPlists: tuplesForPlists, allKeyValueTuples: allKeyValueTuplesSorted)
 generateProtocol(name: protocolName, commonKeys: commonKeys, oddKeys: oddKeys, keysAndTypes: keysAndTypes)
 generateEnum(name: enumName, protocolName: protocolName, allTuples: allTuples, keysAndTypes: keysAndTypes, oddKeys: oddKeys, optionalDictionary: optionalDictionary)

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private func isKeyAvailableInAllPlists(keyToSearch: String, tupleKey: String, tu`
`109`	`109`	`return true`
`110`	`110`	`}`
`111`	`111`
`112`		`-private func generateProtocol(tuplesForPlists: [String: KeyValueTuples], allKeyValueTuples: [String: KeyValueTuples]) -> [String: [String: String]] {`
	`112`	`+private func generateProtocol(tuplesForPlists: [String: KeyValueTuples], allKeyValueTuples: [(String, KeyValueTuples)]) -> [String: [String: String]] {`
`113`	`113`	`var dictionaryWithOptionalValues = [String: [String: String]]()`
`114`	`114`	`for (tupleKey, tuples) in allKeyValueTuples {`
`115`	`115`
`@@ -659,6 +659,7 @@ for plistPath in plists {`
`659`	`659`	`}`
`660`	`660`	`}`
`661`	`661`
`662`		`-let optionalDictionary = generateProtocol(tuplesForPlists: tuplesForPlists, allKeyValueTuples: allKeyValueTuples)`
	`662`	`+let allKeyValueTuplesSorted = allKeyValueTuples.sorted(by: { $0.0 < $1.0 })`
	`663`	`+let optionalDictionary = generateProtocol(tuplesForPlists: tuplesForPlists, allKeyValueTuples: allKeyValueTuplesSorted)`
`663`	`664`	`generateProtocol(name: protocolName, commonKeys: commonKeys, oddKeys: oddKeys, keysAndTypes: keysAndTypes)`
`664`	`665`	`generateEnum(name: enumName, protocolName: protocolName, allTuples: allTuples, keysAndTypes: keysAndTypes, oddKeys: oddKeys, optionalDictionary: optionalDictionary)`