Skip to content
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

Fix cyclical target dependencies #147

Merged
merged 1 commit into from
Nov 12, 2017
Merged

Fix cyclical target dependencies #147

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
16 changes: 13 additions & 3 deletions Sources/XcodeGenKit/PBXProjGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,15 +456,25 @@ public class PBXProjGenerator {
return "\(carthagePath)/\(platformName)"
}

func getAllCarthageDependencies(target: Target) -> [Dependency] {
func getAllCarthageDependencies(target: Target, visitedTargets: [String: Bool] = [:]) -> [Dependency] {

// this is used to resolve cyclical target dependencies
var visitedTargets = visitedTargets
visitedTargets[target.name] = true

var frameworks: [Dependency] = []

for dependency in target.dependencies {
switch dependency.type {
case .carthage:
frameworks.append(dependency)
case .target:
if let target = spec.getTarget(dependency.reference) {
frameworks += getAllCarthageDependencies(target: target)
let targetName = dependency.reference
if visitedTargets[targetName] == true {
return []
}
if let target = spec.getTarget(targetName) {
frameworks += getAllCarthageDependencies(target: target, visitedTargets: visitedTargets)
}
default: break
}
Expand Down
9 changes: 8 additions & 1 deletion Tests/XcodeGenKitTests/ProjectGeneratorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ func projectGeneratorTests() {
}

func getPbxProj(_ spec: ProjectSpec) throws -> PBXProj {
try spec.validate()
let project = try getProject(spec).pbxproj
try project.validate()
return project
Expand Down Expand Up @@ -171,6 +170,14 @@ func projectGeneratorTests() {
try expect(script1.shellScript) == "script1"
try expect(script2.shellScript) == "script2"
}

$0.it("generates targets with cylical dependencies") {
let target1 = Target(name: "target1", type: .framework, platform: .iOS, dependencies: [Dependency(type: .target, reference: "target2")])
let target2 = Target(name: "target2", type: .framework, platform: .iOS, dependencies: [Dependency(type: .target, reference: "target1")])
let spec = ProjectSpec(basePath: "", name: "test", targets: [target1, target2])

_ = try getPbxProj(spec)
}
}

$0.describe("Schemes") {
Expand Down