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

Update to xcproj 0.4.0 #85

Merged
merged 4 commits into from
Oct 12, 2017
+13 −20
Merged

Update to xcproj 0.4.0 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d9c3a9
Update to xcproj 0.4.0
Oct 10, 2017
713631a
Update GeneratedProject file to use the new classes dictionary format
Oct 11, 2017
ca3c64b
Update xcproj to 0.4.1 and Yams to 0.3.7
Oct 12, 2017
6a168ac
Remove workaround typealias
Oct 12, 2017
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
12 changes: 6 additions & 6 deletions Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = (
);
classes = {
};
objectVersion = 46;
objects = {

Expand All @@ -14,7 +14,7 @@
BF2753556301 = {isa = PBXBuildFile; fileRef = FR2993497801 /* MyFramework.framework */; };
BF3154421201 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FR5980633301 /* Assets.xcassets */; };
BF3515549501 /* MyFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = FR7740960501 /* MyFramework.h */; settings = {ATTRIBUTES = (Public, ); }; };
BF3862341101 /* MyFramework.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = FR2993497801 /* MyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
BF3862341101 /* MyFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = FR2993497801 /* MyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
BF4946816301 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = VG1473702401 /* Main.storyboard */; };
BF5986511201 = {isa = PBXBuildFile; fileRef = FR6523263101 /* TestProject.app */; };
BF6182896901 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FR9215298301 /* Result.framework */; };
Expand Down Expand Up @@ -46,7 +46,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
BF3862341101 /* MyFramework.framework in Copy Files */,
BF3862341101 /* MyFramework.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -269,7 +269,7 @@
attributes = {
LastUpgradeCheck = 0900;
};
buildConfigurationList = XCCL81399401 /* Build configuration list for PBXProject */;
buildConfigurationList = XCCL81399401 /* Build configuration list for PBXProject "GeneratedProject" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
knownRegions = (
Expand Down Expand Up @@ -709,7 +709,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = "";
};
XCCL81399401 /* Build configuration list for PBXProject */ = {
XCCL81399401 /* Build configuration list for PBXProject "GeneratedProject" */ = {
isa = XCConfigurationList;
buildConfigurations = (
XCBC47994501 /* Debug */,
Expand Down
17 changes: 4 additions & 13 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,22 @@
"version": "0.7.2"
}
},
{
"package": "Unbox",
"repositoryURL": "https://github.com/JohnSundell/Unbox.git",
"state": {
"branch": null,
"revision": "17ad6aa1cc2f1efa27a0bbbdb66f79796708aa95",
"version": "2.5.0"
}
},
{
"package": "Yams",
"repositoryURL": "https://github.com/jpsim/Yams.git",
"state": {
"branch": null,
"revision": "5ac9248b378b5e12201c255ba74caf990d1e0f4b",
"version": "0.3.6"
"revision": "05921531200acff0d8d9caab5ec77b2bcf300b6b",
"version": "0.3.7"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't stop this from updating (still a little new to the SwiftPM). After looking at the Yams repo, it doesn't appear much changed from 0.3.6 to 0.3.7 that would impact XcodeGen.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's fine

}
},
{
"package": "xcproj",
"repositoryURL": "https://github.com/xcodeswift/xcproj.git",
"state": {
"branch": null,
"revision": "e937b43cefa9c67a1787aba482ceb2f3ba172baf",
"version": "0.3.0"
"revision": "cd1c329c6e092fdf5afbddf10dd59da564293aa6",
"version": "0.4.1"
}
}
]
Expand Down
1 change: 1 addition & 0 deletions Sources/ProjectSpec/Settings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import JSONUtilities
import xcproj
import PathKit
import Yams

public struct Settings: Equatable, JSONObjectConvertible, CustomStringConvertible {

public let buildSettings: BuildSettings
Expand Down
3 changes: 2 additions & 1 deletion Sources/XcodeGenKit/PBXProjGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ public class PBXProjGenerator {

let knownRegions: [String] = ["en", "Base"]
let projectAttributes: [String: Any] = ["LastUpgradeCheck": currentXcodeVersion].merged(spec.attributes)
let root = PBXProject(reference: project.rootObject,
let root = PBXProject(name: spec.name,
reference: project.rootObject,
buildConfigurationList: buildConfigList.reference,
compatibilityVersion: "Xcode 3.2",
mainGroup: mainGroup.reference,
Expand Down