yonaskolb/XcodeGen
1
1
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2024-09-20 00:58:04 +03:00
Code Issues Projects Releases Wiki Activity

Adjust getAllCarthageDependencies to return unique dependencies

Browse Source 
Copies the pattern from `getAllDependenciesPlusTransitiveNeedingEmbedding`. They should be combined into one solution eventually.
This commit is contained in:
Brentley Jones 2018-07-24 18:58:47 -05:00
parent 3598aed039
commit 30d7195097
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/XcodeGenKit/PBXProjGenerator.swift
View File

@ -653,12 +653,9 @@ public class PBXProjGenerator {
buildPhases.append(copyFilesPhase.reference)
}
let carthageFrameworksToEmbed = Array(Set(
carthageDependencies
let carthageFrameworksToEmbed = carthageDependencies
.filter { $0.embed ?? target.shouldEmbedDependencies }
.map { $0.reference }
))
.sorted()
if !carthageFrameworksToEmbed.isEmpty && target.platform != .macOS {
@ -820,7 +817,7 @@ public class PBXProjGenerator {
func getAllCarthageDependencies(target: Target) -> [Dependency] {
// this is used to resolve cyclical target dependencies
var visitedTargets: Set<String> = []
var frameworks: [Dependency] = []
var frameworks: [String: Dependency] = [:]
var queue: [Target] = [target]
while !queue.isEmpty {
@ -830,9 +827,14 @@ public class PBXProjGenerator {
}
for dependency in target.dependencies {
// don't overwrite frameworks, to allow top level ones to rule
if frameworks.contains(reference: dependency.reference) {
continue
}
switch dependency.type {
case .carthage:
frameworks.append(dependency)
frameworks[dependency.reference] = dependency
case .target:
if let target = project.getTarget(dependency.reference) {
queue.append(target)
@ -845,7 +847,7 @@ public class PBXProjGenerator {
visitedTargets.update(with: target.name)
}
return frameworks
return frameworks.sorted(by: { $0.key < $1.key }).map { $0.value }
}
func getAllDependenciesPlusTransitiveNeedingEmbedding(target topLevelTarget: Target) -> [Dependency] {