Skip to content

remove references that are duplicates and are not referenced by build files #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
g-Off merged 1 commit into from
Jun 7, 2019
Merged

remove references that are duplicates and are not referenced by build files #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ playground.xcworkspace
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.build/
.swiftpm

# CocoaPods
#
Expand Down
23 changes: 23 additions & 0 deletions Sources/XcodeProject/Objects+Extensions/PBXGroup+FolderSync.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public extension PBXGroup {
func sync(recursive: Bool, target: PBXTarget? = nil) {
let target = target ?? parentProject?.targets.first
removeDuplicateFiles(recursive: recursive)
removeDuplicateFilesByPath(recursive: recursive)
addMissingFiles(recursive: recursive, target: target)
removeMissingFiles(recursive: recursive)
}
Expand All @@ -65,6 +66,27 @@ public extension PBXGroup {
}
}

private func removeDuplicateFilesByPath(recursive: Bool) {
var itemsByPath: [String: [PBXReference]] = [:]
for i in 0..<children.count {
let child = children[i]
if let path = child.path {
itemsByPath[path, default: []].append(child)
}
if recursive, let group = child as? PBXGroup {
group.removeDuplicateFilesByPath(recursive: recursive)
}
}
let duplicatePathItems = itemsByPath.filter { $0.value.count > 1 }
duplicatePathItems.forEach { (path, references) in
references.forEach { reference in
if reference.buildFiles.isEmpty {
remove(child: reference)
}
}
}
}

private func removeMissingFiles(recursive: Bool) {
var newChildren: [PBXReference] = []
children.forEach {
Expand Down Expand Up @@ -103,6 +125,7 @@ public extension PBXGroup {

private func addMissingFiles(recursive: Bool, target: PBXTarget?) {
guard let url = self.url else { return }

let childPathItems: [(String, PBXReference)] = children.compactMap {
guard let childURL = $0.url else { return nil }
return (childURL.path, $0)
Expand Down
5 changes: 4 additions & 1 deletion Sources/XcodeProject/Objects/PBXGlobalID.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@

import Foundation

public struct PBXGlobalID: RawRepresentable {
public struct PBXGlobalID: RawRepresentable, CustomStringConvertible, CustomDebugStringConvertible {
public var description: String { return rawValue }
public var debugDescription: String { return rawValue }

public let rawValue: String

public init(rawValue: String) {
Expand Down