GitHub/XcodeGen
1
0
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2026-03-18 20:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #142 from bkase/fix-duplicate-sources

Browse Source 
Fix duplicate sources in groups, fixes #141
This commit is contained in:
Yonas Kolb
2017-11-10 01:21:41 +01:00
committed by GitHub
parent be4767be36 a27a25e76f
commit 405b7b7acc
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Fixtures/TestProject/Project.xcodeproj/project.pbxproj
-10
View File
@@ -180,7 +180,6 @@
isa = PBXGroup;
children = (
FR8488480101 /* MoreUnder.swift */,
FR8488480101 /* MoreUnder.swift */,
);
name = UnderFileGroup;
path = UnderFileGroup;
@@ -192,15 +191,6 @@
FR7078510801 /* FrameworkFile.swift */,
FR1345298503 /* Info.plist */,
FR7740960501 /* MyFramework.h */,
FR7078510801 /* FrameworkFile.swift */,
FR1345298503 /* Info.plist */,
FR7740960501 /* MyFramework.h */,
FR7078510801 /* FrameworkFile.swift */,
FR1345298503 /* Info.plist */,
FR7740960501 /* MyFramework.h */,
FR7078510801 /* FrameworkFile.swift */,
FR1345298503 /* Info.plist */,
FR7740960501 /* MyFramework.h */,
);
name = Framework;
path = Framework;
Sources/XcodeGenKit/PBXProjGenerator.swift
+2 -1
View File
@@ -504,7 +504,8 @@ public class PBXProjGenerator {
func getSingleGroup(path: Path, mergingChildren children: [String], depth: Int = 0) -> PBXGroup {
let group: PBXGroup
if let cachedGroup = groupsByPath[path] {
cachedGroup.children += children
// only add the children, that aren't already in the cachedGroup
cachedGroup.children += children.filter{ !cachedGroup.children.contains($0) }
group = cachedGroup
} else {
group = PBXGroup(