Merge pull request #85 from polac24/20220214-remapper-stable

Do not change dependencies order when remapping overlay

Sources/XCRemoteCache/Dependencies/OverlayDependenciesRemapper.swift

@@ -54,14 +54,14 @@ class OverlayDependenciesRemapper: DependenciesRemapper {
     }
 
     func replace(genericPaths: [String]) throws -> [String] {
-        try Set(genericPaths.map {
+        try genericPaths.map {
             try mapPath($0, source: \.virtual, destination: \.local)
-        }).sorted()
+        }
     }
 
     func replace(localPaths: [String]) throws -> [String] {
-        try Set(localPaths.map {
+        try localPaths.map {
             try mapPath($0, source: \.local, destination: \.virtual)
-        }).sorted()
+        }
     }
 }

Tests/XCRemoteCacheTests/Dependencies/OverlayDependenciesRemapperTests.swift

@@ -40,20 +40,20 @@ class OverlayDependenciesRemapperTests: XCTestCase {
         XCTAssertEqual(dependencies, ["/Intermediate/Some/file.h"])
     }
 
-    func testGenericDependenciesAreMerged() throws {
+    func testGenericDependenciesAreNotMerged() throws {
         let remapper = OverlayDependenciesRemapper(overlayReader: overlayReader)
 
 
         let dependencies = try remapper.replace(localPaths: ["/Intermediate/Some/file.h", "/file.h"])
-        XCTAssertEqual(dependencies, ["/file.h"])
+        XCTAssertEqual(dependencies, ["/file.h", "/file.h"])
     }
 
-    func testLocalDependenciesAreMerged() throws {
+    func testLocalDependenciesAreNotMerged() throws {
         let remapper = OverlayDependenciesRemapper(overlayReader: overlayReader)
 
 
         let dependencies = try remapper.replace(genericPaths: ["/Intermediate/Some/file.h", "/file.h"])
-        XCTAssertEqual(dependencies, ["/Intermediate/Some/file.h"])
+        XCTAssertEqual(dependencies, ["/Intermediate/Some/file.h", "/Intermediate/Some/file.h"])
     }
 
     func testMappingsAreReadOnce() throws {