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

Generate correct PBXTargetDependency for external targets. #843

Merged
merged 2 commits into from
Apr 23, 2020
Merged

Generate correct PBXTargetDependency for external targets. #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
907776a
Generate correct PBXTargetDependency for external targets.
ileitch Apr 23, 2020
cbb3a6d
Update CHANGELOG.md
ileitch Apr 23, 2020
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- Prevent test targets from being set as a scheme's launch action [#835](https://github.com/yonaskolb/XcodeGen/pull/835) @brentleyjones
- 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

## 2.15.1

Expand Down
2 changes: 1 addition & 1 deletion Sources/XcodeGenKit/PBXProjGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ public class PBXProjGenerator {

let targetDependency = addObject(
PBXTargetDependency(
target: targetObject,
name: targetObject.name,
targetProxy: targetProxy
)
)
Expand Down
12 changes: 6 additions & 6 deletions Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@
buildRules = (
);
dependencies = (
7C4CC3918BD0DA1E04A5E2B0 /* PBXTargetDependency */,
4FA29DA80DA668224AED741F /* PBXTargetDependency */,
0D33D01C71E8002A07F02122 /* PBXTargetDependency */,
A94F38390A74E215EC107BB5 /* PBXTargetDependency */,
E84285243DE0BB361A708079 /* PBXTargetDependency */,
Expand Down Expand Up @@ -2212,6 +2212,11 @@
target = 0867B0DACEF28C11442DE8F7 /* App_iOS */;
targetProxy = 469D922BE967C6D52ED84552 /* PBXContainerItemProxy */;
};
4FA29DA80DA668224AED741F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = ExternalTarget;
targetProxy = FF75DC967D1097BC31DCF5E6 /* PBXContainerItemProxy */;
};
62DA64F61B337719A2CF993D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 307AE3FA155FFD09B74AE351 /* App_watchOS Extension */;
Expand All @@ -2222,11 +2227,6 @@
target = 0636AAF06498C336E1CEEDE4 /* TestFramework */;
targetProxy = C42BA4EA0239AF536F0F0993 /* PBXContainerItemProxy */;
};
7C4CC3918BD0DA1E04A5E2B0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E76A5F5E363E470416D3B487;
targetProxy = FF75DC967D1097BC31DCF5E6 /* PBXContainerItemProxy */;
};
7EFC0278E67CD35F8981993C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 578C80E461E675508CED5DC3 /* StaticLibrary_ObjC_macOS */;
Expand Down