Skip to content

Use OrderedDictionary for PIF.BuildSettings internal properties #8032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Use OrderedDictionary for PIF.BuildSettings internal properties #8032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Sources/XCBuildSupport/PIF.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import Basics
import Foundation
import OrderedCollections
import PackageModel

import struct TSCBasic.ByteString
Expand Down Expand Up @@ -1011,10 +1012,10 @@ public enum PIF {
}
}

public private(set) var platformSpecificSingleValueSettings = [Platform: [SingleValueSetting: String]]()
public private(set) var platformSpecificMultipleValueSettings = [Platform: [MultipleValueSetting: [String]]]()
public private(set) var singleValueSettings: [SingleValueSetting: String] = [:]
public private(set) var multipleValueSettings: [MultipleValueSetting: [String]] = [:]
public private(set) var platformSpecificSingleValueSettings = OrderedDictionary<Platform, OrderedDictionary<SingleValueSetting, String>>()
public private(set) var platformSpecificMultipleValueSettings = OrderedDictionary<Platform, OrderedDictionary<MultipleValueSetting, [String]>>()
public private(set) var singleValueSettings: OrderedDictionary<SingleValueSetting, String> = [:]
public private(set) var multipleValueSettings: OrderedDictionary<MultipleValueSetting, [String]> = [:]

public subscript(_ setting: SingleValueSetting) -> String? {
get { singleValueSettings[setting] }
Expand Down Expand Up @@ -1108,10 +1109,10 @@ public enum PIF {
public init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)

platformSpecificSingleValueSettings = try container.decodeIfPresent([Platform: [SingleValueSetting: String]].self, forKey: .platformSpecificSingleValueSettings) ?? .init()
platformSpecificMultipleValueSettings = try container.decodeIfPresent([Platform: [MultipleValueSetting: [String]]].self, forKey: .platformSpecificMultipleValueSettings) ?? .init()
singleValueSettings = try container.decodeIfPresent([SingleValueSetting: String].self, forKey: .singleValueSettings) ?? [:]
multipleValueSettings = try container.decodeIfPresent([MultipleValueSetting: [String]] .self, forKey: .multipleValueSettings) ?? [:]
platformSpecificSingleValueSettings = try container.decodeIfPresent(OrderedDictionary<Platform, OrderedDictionary<SingleValueSetting, String>>.self, forKey: .platformSpecificSingleValueSettings) ?? .init()
platformSpecificMultipleValueSettings = try container.decodeIfPresent(OrderedDictionary<Platform, OrderedDictionary<MultipleValueSetting, [String]>>.self, forKey: .platformSpecificMultipleValueSettings) ?? .init()
singleValueSettings = try container.decodeIfPresent(OrderedDictionary<SingleValueSetting, String>.self, forKey: .singleValueSettings) ?? [:]
multipleValueSettings = try container.decodeIfPresent(OrderedDictionary<MultipleValueSetting, [String]>.self, forKey: .multipleValueSettings) ?? [:]
}
}
}
Expand Down
5 changes: 0 additions & 5 deletions Tests/XCBuildSupportTests/PIFTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,6 @@ class PIFTests: XCTestCase {
)

func testRoundTrip() throws {
// FIXME: Disabled because we need to store build settings in
// sorted dictionary in order to get deterministic output
// when encoding (SR-12587).
#if false
let encoder = JSONEncoder.makeWithDefaults()
if #available(macOS 10.13, *) {
encoder.outputFormatting = [.sortedKeys, .prettyPrinted]
Expand All @@ -233,7 +229,6 @@ class PIFTests: XCTestCase {
let decodedString = String(decoding: decodedPIF, as: UTF8.self)

XCTAssertEqual(originalString, decodedString)
#endif
}

func testEncodable() throws {
Expand Down