Roll back to arrays and reduce the diff

Author: MaxDesiatov

Sources/PackageGraph/PackageGraph+Loading.swift

@@ -862,10 +862,10 @@ private final class ResolvedTargetBuilder: ResolvedBuilder<ResolvedTarget> {
     enum Dependency {
 
         /// Dependency to another target, with conditions.
-        case target(_ target: ResolvedTargetBuilder, conditions: Set<PackageCondition>)
+        case target(_ target: ResolvedTargetBuilder, conditions: [PackageCondition])
 
         /// Dependency to a product, with conditions.
-        case product(_ product: ResolvedProductBuilder, conditions: Set<PackageCondition>)
+        case product(_ product: ResolvedProductBuilder, conditions: [PackageCondition])
     }
 
     /// The target reference.

Sources/PackageGraph/Resolution/ResolvedTarget.swift

@@ -19,10 +19,10 @@ public final class ResolvedTarget {
     /// Represents dependency of a resolved target.
     public enum Dependency: Hashable {
         /// Direct dependency of the target. This target is in the same package and should be statically linked.
-        case target(_ target: ResolvedTarget, conditions: Set<PackageCondition>)
+        case target(_ target: ResolvedTarget, conditions: [PackageCondition])
 
         /// The target depends on this product.
-        case product(_ product: ResolvedProduct, conditions: Set<PackageCondition>)
+        case product(_ product: ResolvedProduct, conditions: [PackageCondition])
 
         public var target: ResolvedTarget? {
             switch self {
@@ -38,7 +38,7 @@ public final class ResolvedTarget {
             }
         }
 
-        public var conditions: Set<PackageCondition> {
+        public var conditions: [PackageCondition] {
             switch self {
             case .target(_, let conditions): return conditions
             case .product(_, let conditions): return conditions

Sources/PackageLoading/PackageBuilder.swift

@@ -1136,7 +1136,7 @@ public final class PackageBuilder {
             // Create an assignment for this setting.
             var assignment = BuildSettings.Assignment()
             assignment.values = values
-            assignment.uniqueConditions = self.buildConditions(from: setting.condition)
+            assignment.conditions = self.buildConditions(from: setting.condition)
 
             // Finally, add the assignment to the assignment table.
             table.add(assignment, for: decl)
@@ -1145,12 +1145,12 @@ public final class PackageBuilder {
         return table
     }
 
-    func buildConditions(from condition: PackageConditionDescription?) -> Set<PackageCondition> {
-        var conditions: Set<PackageCondition> = []
+    func buildConditions(from condition: PackageConditionDescription?) -> [PackageCondition] {
+        var conditions = [PackageCondition]()
 
         if let config = condition?.config.flatMap({ BuildConfiguration(rawValue: $0) }) {
             let condition = ConfigurationCondition(configuration: config)
-            conditions.insert(.configuration(condition))
+            conditions.append(.configuration(condition))
         }
 
         if let platforms = condition?.platformNames.map({
@@ -1163,7 +1163,7 @@ public final class PackageBuilder {
            !platforms.isEmpty
         {
             let condition = PlatformsCondition(platforms: platforms)
-            conditions.insert(.platforms(condition))
+            conditions.append(.platforms(condition))
         }
 
         return conditions

Sources/PackageModel/BuildSettings.swift

@@ -44,20 +44,9 @@ public enum BuildSettings {
         public var values: [String]
 
         /// The condition associated with this assignment.
-        @available(*, deprecated, renamed: "uniqueConditions")
-        public var conditions: [PackageConditionProtocol] {
+        public var conditions: [PackageCondition] {
             get {
-                return _conditions.map{ $0.condition }
-            }
-            set {
-                _conditions = newValue.map{ PackageConditionWrapper($0) }
-            }
-        }        
-
-        /// A set of unique conditions associated with this assignment.
-        public var uniqueConditions: Set<PackageCondition> {
-            get {
-                return Set(_conditions.map(\.underlying))
+                return _conditions.map { $0.underlying }
             }
             set {
                 _conditions = newValue.map { PackageConditionWrapper($0) }
@@ -111,7 +100,7 @@ public enum BuildSettings {
             // Add values from each assignment if it satisfies the build environment.
             let values = assignments
                 .lazy
-                .filter { $0.uniqueConditions.allSatisfy { $0.satisfies(self.environment) } }
+                .filter { $0.conditions.allSatisfy { $0.satisfies(self.environment) } }
                 .flatMap { $0.values }
 
             return Array(values)

Sources/PackageModel/Target/Target.swift

@@ -79,10 +79,10 @@ public class Target: PolymorphicCodableProtocol {
     /// A target dependency to a target or product.
     public enum Dependency {
         /// A dependency referencing another target, with conditions.
-        case target(_ target: Target, conditions: Set<PackageCondition>)
+        case target(_ target: Target, conditions: [PackageCondition])
 
         /// A dependency referencing a product, with conditions.
-        case product(_ product: ProductReference, conditions: Set<PackageCondition>)
+        case product(_ product: ProductReference, conditions: [PackageCondition])
 
         /// The target if the dependency is a target dependency.
         public var target: Target? {
@@ -103,7 +103,7 @@ public class Target: PolymorphicCodableProtocol {
         }
 
         /// The dependency conditions.
-        public var conditions: Set<PackageCondition> {
+        public var conditions: [PackageCondition] {
             switch self {
             case .target(_, let conditions):
                 return conditions

Sources/SPMBuildCore/Plugins/PluginInvocation.swift

@@ -584,7 +584,7 @@ public extension PluginTarget {
 }
 
 fileprivate extension Target.Dependency {
-    var conditions: Set<PackageCondition> {
+    var conditions: [PackageCondition] {
         switch self {
         case .target(_, let conditions): return conditions
         case .product(_, let conditions): return conditions

Sources/XCBuildSupport/PIF.swift

@@ -1002,7 +1002,7 @@ public enum PIF {
             }
 
             public var conditions: [String] {
-                let filters = Set([.init(platforms: [packageModelPlatform])])
+                let filters = [.init(platforms: [packageModelPlatform])]
                     .toPlatformFilters().map { (filter: PIF.PlatformFilter) -> String in
                     if filter.environment.isEmpty {
                         return filter.platform

Sources/XCBuildSupport/PIFBuilder.swift

@@ -781,7 +781,7 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
     private func addDependency(
         to target: ResolvedTarget,
         in pifTarget: PIFTargetBuilder,
-        conditions: Set<PackageCondition>,
+        conditions: [PackageCondition],
         linkProduct: Bool
     ) {
         // Only add the binary target as a library when we want to link against the product.
@@ -803,7 +803,7 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
     private func addDependency(
         to product: ResolvedProduct,
         in pifTarget: PIFTargetBuilder,
-        conditions: Set<PackageCondition>,
+        conditions: [PackageCondition],
         linkProduct: Bool
     ) {
         pifTarget.addDependency(
@@ -1498,15 +1498,15 @@ private extension BuildSettings.AssignmentTable {
 
 private extension BuildSettings.Assignment {
     var configurations: [BuildConfiguration] {
-        if let configurationCondition = uniqueConditions.lazy.compactMap(\.configurationCondition).first {
+        if let configurationCondition = conditions.lazy.compactMap(\.configurationCondition).first {
             return [configurationCondition.configuration]
         } else {
             return BuildConfiguration.allCases
         }
     }
 
     var pifPlatforms: [PIF.BuildSettings.Platform]? {
-        if let platformsCondition = uniqueConditions.lazy.compactMap(\.platformsCondition).first {
+        if let platformsCondition = conditions.lazy.compactMap(\.platformsCondition).first {
             return platformsCondition.platforms.compactMap { PIF.BuildSettings.Platform(rawValue: $0.name) }
         } else {
             return nil
@@ -1537,7 +1537,7 @@ public struct DelayedImmutable<Value> {
     }
 }
 
-extension Set<PackageCondition> {
+extension [PackageCondition] {
     func toPlatformFilters() -> [PIF.PlatformFilter] {
         var result: [PIF.PlatformFilter] = []
         let platformConditions = self.compactMap(\.platformsCondition).flatMap { $0.platforms }

Tests/PackageLoadingTests/PackageBuilderTests.swift

@@ -2990,7 +2990,7 @@ class PackageBuilderTests: XCTestCase {
 
         var assignment = BuildSettings.Assignment()
         assignment.values = ["YOLO"]
-        assignment.uniqueConditions = Set([.init(platforms: [PackageModel.Platform.custom(name: "bestOS", oldestSupportedVersion: .unknown)])])
+        assignment.conditions = [.init(platforms: [PackageModel.Platform.custom(name: "bestOS", oldestSupportedVersion: .unknown)])]
 
         var settings = BuildSettings.AssignmentTable()
         settings.add(assignment, for: .SWIFT_ACTIVE_COMPILATION_CONDITIONS)