Fix sorting keys

swiftlang · Jun 10, 2023 · d62fc6d · d62fc6d
1 parent b05e8a0
commit d62fc6d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Sources/Foundation/JSONEncoder.swift b/Sources/Foundation/JSONEncoder.swift
@@ -1011,7 +1011,7 @@ extension JSONValue {
                 bytes.append(._closebracket)
             case .object(let dict):
                 if #available(macOS 10.13, *), options.contains(.sortedKeys) {
-                    let sorted = dict.sorted { $0.key < $1.key }
+                    let sorted = dict.sorted { $0.key.compare($1.key, options: [.caseInsensitive, .diacriticInsensitive, .forcedOrdering, .numeric, .widthInsensitive]) == .orderedAscending }
                     self.writeObject(sorted, into: &bytes)
                 } else {
                     self.writeObject(dict, into: &bytes)
@@ -1073,7 +1073,7 @@ extension JSONValue {
                 bytes.append(._closebracket)
             case .object(let dict):
                 if #available(macOS 10.13, *), options.contains(.sortedKeys) {
-                    let sorted = dict.sorted { $0.key < $1.key }
+                    let sorted = dict.sorted { $0.key.compare($1.key, options: [.caseInsensitive, .diacriticInsensitive, .forcedOrdering, .numeric, .widthInsensitive]) == .orderedAscending }
                     self.writePrettyObject(sorted, into: &bytes, depth: depth)
                 } else {
                     self.writePrettyObject(dict, into: &bytes, depth: depth)