Merge branch 'main' into improve-resolve-build-products-performance

giginet · Jul 11, 2024 · b378923 · b378923
2 parents 1bb3d13 + 61c5bab
commit b378923
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Sources/ScipioKit/DescriptionPackage.swift b/Sources/ScipioKit/DescriptionPackage.swift
@@ -149,7 +149,7 @@ struct DescriptionPackage {
 }
 
 extension DescriptionPackage {
-    func resolveBuildProducts() throws -> [BuildProduct] {
+    func resolveBuildProducts() throws -> OrderedSet<BuildProduct> {
         let resolver = BuildProductsResolver(descriptionPackage: self)
         return try resolver.resolveBuildProducts()
     }
@@ -186,7 +186,6 @@ struct BuildProduct: Hashable, Sendable {
     }
 }
 
-
 private final class BuildProductsResolver {
     private var buildProductsCache: [BuildProduct: Set<BuildProduct>] = [:]
     let descriptionPackage: DescriptionPackage
@@ -195,7 +194,7 @@ private final class BuildProductsResolver {
         self.descriptionPackage = descriptionPackage
     }
 
-    func resolveBuildProducts() throws -> [BuildProduct] {
+    func resolveBuildProducts() throws -> OrderedSet<BuildProduct> {
         let targetsToBuild = try targetsToBuild()
         var products = try targetsToBuild.flatMap(resolveBuildProduct(from:))
 
@@ -232,7 +231,7 @@ private final class BuildProductsResolver {
             }
         }
 
-        return products.reversed()
+        return OrderedSet(products.reversed())
     }
 
     private func targetsToBuild() throws -> [ScipioResolvedModule] {