diff --git a/Package.swift b/Package.swift index 3a4e518ef70..63c3ebe3bac 100644 --- a/Package.swift +++ b/Package.swift @@ -802,7 +802,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil { .package(url: "https://github.com/apple/swift-crypto.git", .upToNextMinor(from: "3.0.0")), .package(url: "https://github.com/apple/swift-syntax.git", branch: relatedDependenciesBranch), .package(url: "https://github.com/apple/swift-system.git", .upToNextMinor(from: "1.1.1")), - .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "1.0.1")), + .package(url: "https://github.com/apple/swift-collections.git", "1.0.1" ..< "1.2.0"), .package(url: "https://github.com/apple/swift-certificates.git", .upToNextMinor(from: "1.0.1")), ] } else { diff --git a/Sources/PackageGraph/Resolution/PubGrub/PubGrubDependencyResolver.swift b/Sources/PackageGraph/Resolution/PubGrub/PubGrubDependencyResolver.swift index ffee1492d1e..8a89950bf47 100644 --- a/Sources/PackageGraph/Resolution/PubGrub/PubGrubDependencyResolver.swift +++ b/Sources/PackageGraph/Resolution/PubGrub/PubGrubDependencyResolver.swift @@ -638,7 +638,7 @@ public struct PubGrubDependencyResolver { let priorCause = _mostRecentSatisfier.cause! - var newTerms = incompatibility.terms.filter { $0 != mostRecentTerm } + var newTerms = Array(incompatibility.terms.filter { $0 != mostRecentTerm }) newTerms += priorCause.terms.filter { $0.node != _mostRecentSatisfier.term.node } if let _difference = difference {