Don't deduplicate files in include with different paths but a same …

…name (#849) * Distinguish included files by their full path * Add test with same-name includes * Update CHANGELOG
yonaskolb · Apr 29, 2020 · f3d2d09 · f3d2d09
1 parent 0ad02b7
commit f3d2d09
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Implicitly include bundles in the Copy Bundle Resources build phase. [#838](https://github.com/yonaskolb/XcodeGen/pull/838) @skirchmeier
 - Fixed dumping a project manifest which contains an array of project references @paciej00
 - Generate correct PBXTargetDependency for external targets. [#843](https://github.com/yonaskolb/XcodeGen/pull/843) @ileitch
+- Don't deduplicate files in `include` with different path but same name. [#849](https://github.com/yonaskolb/XcodeGen/pull/849) @akkyie
 
 ## 2.15.1
 

diff --git a/Sources/ProjectSpec/SpecFile.swift b/Sources/ProjectSpec/SpecFile.swift
@@ -8,7 +8,7 @@ public struct SpecFile {
     public let jsonDictionary: JSONDictionary
     public let subSpecs: [SpecFile]
 
-    private let filename: String
+    private let filePath: Path
 
     fileprivate struct Include {
         let path: Path
@@ -41,34 +41,34 @@ public struct SpecFile {
     }
 
     public init(path: Path) throws {
-        try self.init(filename: path.lastComponent, basePath: path.parent())
+        try self.init(filePath: path, basePath: path.parent())
     }
 
-    public init(filename: String, jsonDictionary: JSONDictionary, basePath: Path = "", relativePath: Path = "", subSpecs: [SpecFile] = []) {
+    public init(filePath: Path, jsonDictionary: JSONDictionary, basePath: Path = "", relativePath: Path = "", subSpecs: [SpecFile] = []) {
         self.basePath = basePath
         self.relativePath = relativePath
         self.jsonDictionary = jsonDictionary
         self.subSpecs = subSpecs
-        self.filename = filename
+        self.filePath = filePath
     }
 
     private init(include: Include, basePath: Path, relativePath: Path) throws {
         let basePath = include.relativePaths ? (basePath + relativePath) : (basePath + relativePath + include.path.parent())
         let relativePath = include.relativePaths ? include.path.parent() : Path()
 
-        try self.init(filename: include.path.lastComponent, basePath: basePath, relativePath: relativePath)
+        try self.init(filePath: include.path, basePath: basePath, relativePath: relativePath)
     }
 
-    private init(filename: String, basePath: Path, relativePath: Path = "") throws {
-        let path = basePath + relativePath + filename
+    private init(filePath: Path, basePath: Path, relativePath: Path = "") throws {
+        let path = basePath + relativePath + filePath.lastComponent
         let jsonDictionary = try SpecFile.loadDictionary(path: path)
 
         let includes = Include.parse(json: jsonDictionary["include"])
         let subSpecs: [SpecFile] = try includes.map { include in
             try SpecFile(include: include, basePath: basePath, relativePath: relativePath)
         }
 
-        self.init(filename: filename, jsonDictionary: jsonDictionary, basePath: basePath, relativePath: relativePath, subSpecs: subSpecs)
+        self.init(filePath: filePath, jsonDictionary: jsonDictionary, basePath: basePath, relativePath: relativePath, subSpecs: subSpecs)
     }
 
     static func loadDictionary(path: Path) throws -> JSONDictionary {
@@ -97,7 +97,7 @@ public struct SpecFile {
     }
 
     func mergedDictionary(set mergedTargets: inout Set<String>) -> JSONDictionary {
-        let name = (basePath + relativePath + Path(filename)).description
+        let name = filePath.description
 
         guard !mergedTargets.contains(name) else { return [:] }
         mergedTargets.insert(name)
@@ -116,7 +116,7 @@ public struct SpecFile {
 
         let jsonDictionary = Project.pathProperties.resolvingPaths(in: self.jsonDictionary, relativeTo: relativePath)
         return SpecFile(
-            filename: filename,
+            filePath: filePath,
             jsonDictionary: jsonDictionary,
             relativePath: self.relativePath,
             subSpecs: subSpecs.map { $0.resolvingPaths(relativeTo: relativePath) }

diff --git a/Tests/Fixtures/duplicated_include/different_path/duplicated_import_root.yml b/Tests/Fixtures/duplicated_include/different_path/duplicated_import_root.yml
@@ -0,0 +1,3 @@
+name: DuplicatedImportRoot
+fileGroups:
+  - Third
diff --git a/Tests/Fixtures/duplicated_include/duplicated_import_sut.yml b/Tests/Fixtures/duplicated_include/duplicated_import_sut.yml
@@ -2,6 +2,7 @@ include:
   - duplicated_import_transitive.yml
   - duplicated_import_root.yml
   - duplicated_import_root.yml
+  - different_path/duplicated_import_root.yml
 name: DuplicatedImportDependent
 targets:
   IncludedTarget:

diff --git a/Tests/ProjectSpecTests/SpecLoadingTests.swift b/Tests/ProjectSpecTests/SpecLoadingTests.swift
@@ -16,7 +16,7 @@ class SpecLoadingTests: XCTestCase {
                 let path = fixturePath + "duplicated_include/duplicated_import_sut.yml"
                 let project = try loadSpec(path: path)
 
-                try expect(project.fileGroups) == ["First", "Second"]
+                try expect(project.fileGroups) == ["First", "Second", "Third"]
 
                 let sutTarget = project.targets.first
                 try expect(sutTarget?.sources) == [TargetSource(path: "template")]