Merge pull request #85 from enmiller/master

Update to xcproj 0.4.0
yonaskolb · Oct 12, 2017 · 102d035 · 102d035
2 parents ea6d606 + 6a168ac
commit 102d035
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 20 deletions.
diff --git a/Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj b/Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj
@@ -1,8 +1,8 @@
 // !$*UTF8*$!
 {
 	archiveVersion = 1;
-	classes = (
-	);
+	classes = {
+	};
 	objectVersion = 46;
 	objects = {
 
@@ -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 */; };
@@ -46,7 +46,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				BF3862341101 /* MyFramework.framework in Copy Files */,
+				BF3862341101 /* MyFramework.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -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 = (
@@ -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 */,

diff --git a/Package.resolved b/Package.resolved
@@ -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"
         }
       },
       {
         "package": "xcproj",
         "repositoryURL": "https://github.com/xcodeswift/xcproj.git",
         "state": {
           "branch": null,
-          "revision": "e937b43cefa9c67a1787aba482ceb2f3ba172baf",
-          "version": "0.3.0"
+          "revision": "cd1c329c6e092fdf5afbddf10dd59da564293aa6",
+          "version": "0.4.1"
         }
       }
     ]

diff --git a/Sources/ProjectSpec/Settings.swift b/Sources/ProjectSpec/Settings.swift
@@ -11,6 +11,7 @@ import JSONUtilities
 import xcproj
 import PathKit
 import Yams
+
 public struct Settings: Equatable, JSONObjectConvertible, CustomStringConvertible {
 
     public let buildSettings: BuildSettings

diff --git a/Sources/XcodeGenKit/PBXProjGenerator.swift b/Sources/XcodeGenKit/PBXProjGenerator.swift
@@ -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,