Skip to content

Commit 49875a3

Browse files
yonaskolbyonaskolb
authored
Merge pull request #56 from yonaskolb/xcodeproj_0.1.2
Upgrade to xcodeproj 0.1.2
2 parents 9670a35 + 956edd3 commit 49875a3

File tree

5 files changed

+57
-86
lines changed

5 files changed

+57
-86
lines changed

‎Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
BF2753556301 = {isa = PBXBuildFile; fileRef = FR2993497801 /* MyFramework.framework */; };
1515
BF3154421201 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FR5980633301 /* Assets.xcassets */; };
1616
BF3515549501 /* MyFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = FR7740960501 /* MyFramework.h */; settings = {ATTRIBUTES = (Public, ); }; };
17-
BF3862341101 = {isa = PBXBuildFile; fileRef = FR2993497801 /* MyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
17+
BF3862341101 /* MyFramework.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = FR2993497801 /* MyFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1818
BF4946816301 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = VG1473702401 /* Main.storyboard */; };
1919
BF5986511201 = {isa = PBXBuildFile; fileRef = FR6523263101 /* TestProject.app */; };
2020
BF9001417701 /* TestProjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR6877173101 /* TestProjectTests.swift */; };
@@ -45,27 +45,27 @@
4545
dstPath = "";
4646
dstSubfolderSpec = 10;
4747
files = (
48-
BF3862341101 /* MyFramework.framework */,
48+
BF3862341101 /* MyFramework.framework in Copy Files */,
4949
);
5050
runOnlyForDeploymentPostprocessing = 0;
5151
};
5252
/* End PBXCopyFilesBuildPhase section */
5353

5454
/* Begin PBXFileReference section */
55-
FR1332263601 /* AppDelegate.swift */ = {isa = PBXFileReference; path = AppDelegate.swift; sourceTree = "<group>"; };
56-
FR1345298501 /* Info.plist */ = {isa = PBXFileReference; path = Info.plist; sourceTree = "<group>"; };
57-
FR1345298502 /* Info.plist */ = {isa = PBXFileReference; path = Info.plist; sourceTree = "<group>"; };
58-
FR1345298503 /* Info.plist */ = {isa = PBXFileReference; path = Info.plist; sourceTree = "<group>"; };
59-
FR2653659501 /* TestProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = xctest; includeInIndex = 0; path = TestProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
60-
FR2993497801 /* MyFramework.framework */ = {isa = PBXFileReference; explicitFileType = framework; includeInIndex = 0; path = MyFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
61-
FR3676338401 /* Base */ = {isa = PBXFileReference; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
62-
FR3676338402 /* Base */ = {isa = PBXFileReference; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
63-
FR5980633301 /* Assets.xcassets */ = {isa = PBXFileReference; path = Assets.xcassets; sourceTree = "<group>"; };
64-
FR6218091901 /* ViewController.swift */ = {isa = PBXFileReference; path = ViewController.swift; sourceTree = "<group>"; };
65-
FR6523263101 /* TestProject.app */ = {isa = PBXFileReference; explicitFileType = app; includeInIndex = 0; path = TestProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
66-
FR6877173101 /* TestProjectTests.swift */ = {isa = PBXFileReference; path = TestProjectTests.swift; sourceTree = "<group>"; };
67-
FR7078510801 /* FrameworkFile.swift */ = {isa = PBXFileReference; path = FrameworkFile.swift; sourceTree = "<group>"; };
68-
FR7740960501 /* MyFramework.h */ = {isa = PBXFileReference; path = MyFramework.h; sourceTree = "<group>"; };
55+
FR1332263601 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
56+
FR1345298501 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
57+
FR1345298502 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
58+
FR1345298503 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
59+
FR2653659501 /* TestProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = xctest; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = TestProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
60+
FR2993497801 /* MyFramework.framework */ = {isa = PBXFileReference; explicitFileType = framework; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = MyFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
61+
FR3676338401 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
62+
FR3676338402 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
63+
FR5980633301 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
64+
FR6218091901 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
65+
FR6523263101 /* TestProject.app */ = {isa = PBXFileReference; explicitFileType = app; includeInIndex = 0; lastKnownFileType = wrapper.application; path = TestProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
66+
FR6877173101 /* TestProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestProjectTests.swift; sourceTree = "<group>"; };
67+
FR7078510801 /* FrameworkFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkFile.swift; sourceTree = "<group>"; };
68+
FR7740960501 /* MyFramework.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyFramework.h; sourceTree = "<group>"; };
6969
/* End PBXFileReference section */
7070

7171
/* Begin PBXGroup section */
@@ -138,7 +138,7 @@
138138
isa = PBXHeadersBuildPhase;
139139
buildActionMask = 2147483647;
140140
files = (
141-
BF3515549501 /* MyFramework.h */,
141+
BF3515549501 /* MyFramework.h in Headers */,
142142
);
143143
runOnlyForDeploymentPostprocessing = 0;
144144
};
@@ -176,7 +176,7 @@
176176
SBP299349701 /* Sources */,
177177
RBP299349701 /* Resources */,
178178
HBP299349701 /* Headers */,
179-
SSBP35382101 /* Run Script */,
179+
SSBP35382101 /* Swiftlint */,
180180
);
181181
buildRules = (
182182
);
@@ -193,9 +193,9 @@
193193
SBP652326301 /* Sources */,
194194
RBP652326301 /* Resources */,
195195
HBP652326301 /* Headers */,
196-
CFBP50493301 /* Copy Files */,
197-
SSBP24648001 /* Run Script */,
198-
SSBP19207501 /* Run Script */,
196+
CFBP50493301 /* CopyFiles */,
197+
SSBP24648001 /* Strip Unused Architectures from Frameworks */,
198+
SSBP19207501 /* Swiftlint */,
199199
);
200200
buildRules = (
201201
);
@@ -249,16 +249,16 @@
249249
isa = PBXResourcesBuildPhase;
250250
buildActionMask = 2147483647;
251251
files = (
252-
BF4946816301 /* Main.storyboard */,
253-
BF1911148401 /* LaunchScreen.storyboard */,
254-
BF3154421201 /* Assets.xcassets */,
252+
BF3154421201 /* Assets.xcassets in Resources */,
253+
BF1911148401 /* LaunchScreen.storyboard in Resources */,
254+
BF4946816301 /* Main.storyboard in Resources */,
255255
);
256256
runOnlyForDeploymentPostprocessing = 0;
257257
};
258258
/* End PBXResourcesBuildPhase section */
259259

260260
/* Begin PBXShellScriptBuildPhase section */
261-
SSBP19207501 /* Run Script */ = {
261+
SSBP19207501 /* Swiftlint */ = {
262262
isa = PBXShellScriptBuildPhase;
263263
buildActionMask = 2147483647;
264264
files = (
@@ -269,10 +269,10 @@
269269
outputPaths = (
270270
);
271271
runOnlyForDeploymentPostprocessing = 0;
272-
shellPath = /bin/sh;
272+
shellPath = bin/sh;
273273
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
274274
};
275-
SSBP24648001 /* Run Script */ = {
275+
SSBP24648001 /* Strip Unused Architectures from Frameworks */ = {
276276
isa = PBXShellScriptBuildPhase;
277277
buildActionMask = 2147483647;
278278
files = (
@@ -283,10 +283,10 @@
283283
outputPaths = (
284284
);
285285
runOnlyForDeploymentPostprocessing = 1;
286-
shellPath = /bin/sh;
286+
shellPath = bin/sh;
287287
shellScript = "################################################################################\n#\n# Copyright 2015 Realm Inc.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\n################################################################################\n\n# This script strips all non-valid architectures from dynamic libraries in\n# the application's `Frameworks` directory.\n#\n# The following environment variables are required:\n#\n# BUILT_PRODUCTS_DIR\n# FRAMEWORKS_FOLDER_PATH\n# VALID_ARCHS\n# EXPANDED_CODE_SIGN_IDENTITY\n\n\n# Signs a framework with the provided identity\ncode_sign() {\n # Use the current code_sign_identitiy\n echo \"Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n echo \"/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1\"\n /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"\n}\n\n# Set working directory to product’s embedded frameworks\ncd \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\n\nif [ \"$ACTION\" = \"install\" ]; then\n echo \"Copy .bcsymbolmap files to .xcarchive\"\n find . -name '*.bcsymbolmap' -type f -exec mv {} \"${CONFIGURATION_BUILD_DIR}\" \;\nelse\n # Delete *.bcsymbolmap files from framework bundle unless archiving\n find . -name '*.bcsymbolmap' -type f -exec rm -rf \"{}\" +\;\nfi\n\necho \"Stripping frameworks\"\n\nfor file in $(find . -type f -perm +111); do\n # Skip non-dynamic libraries\n if ! [[ \"$(file \"$file\")\" == *\"dynamically linked shared library\"* ]]; then\n continue\n fi\n # Get architectures for current file\n archs=\"$(lipo -info \"${file}\" | rev | cut -d ':' -f1 | rev)\"\n stripped=\"\"\n for arch in $archs; do\n if ! [[ \"${VALID_ARCHS}\" == *\"$arch\"* ]]; then\n # Strip non-valid architectures in-place\n lipo -remove \"$arch\" -output \"$file\" \"$file\" || exit 1\n stripped=\"$stripped $arch\"\n fi\n done\n if [[ \"$stripped\" != \"\" ]]; then\n echo \"Stripped $file of architectures:$stripped\"\n if [ \"${CODE_SIGNING_REQUIRED}\" == \"YES\" ]; then\n code_sign \"${file}\"\n fi\n fi\ndone\n";
288288
};
289-
SSBP35382101 /* Run Script */ = {
289+
SSBP35382101 /* Swiftlint */ = {
290290
isa = PBXShellScriptBuildPhase;
291291
buildActionMask = 2147483647;
292292
files = (
@@ -297,7 +297,7 @@
297297
outputPaths = (
298298
);
299299
runOnlyForDeploymentPostprocessing = 0;
300-
shellPath = /bin/sh;
300+
shellPath = bin/sh;
301301
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
302302
};
303303
/* End PBXShellScriptBuildPhase section */
@@ -307,24 +307,24 @@
307307
isa = PBXSourcesBuildPhase;
308308
buildActionMask = 2147483647;
309309
files = (
310-
BF9001417701 /* TestProjectTests.swift */,
310+
BF9001417701 /* TestProjectTests.swift in Sources */,
311311
);
312312
runOnlyForDeploymentPostprocessing = 0;
313313
};
314314
SBP299349701 /* Sources */ = {
315315
isa = PBXSourcesBuildPhase;
316316
buildActionMask = 2147483647;
317317
files = (
318-
BF9155249601 /* FrameworkFile.swift */,
318+
BF9155249601 /* FrameworkFile.swift in Sources */,
319319
);
320320
runOnlyForDeploymentPostprocessing = 0;
321321
};
322322
SBP652326301 /* Sources */ = {
323323
isa = PBXSourcesBuildPhase;
324324
buildActionMask = 2147483647;
325325
files = (
326-
BF1073850101 /* AppDelegate.swift */,
327-
BF1744565901 /* ViewController.swift */,
326+
BF1073850101 /* AppDelegate.swift in Sources */,
327+
BF1744565901 /* ViewController.swift in Sources */,
328328
);
329329
runOnlyForDeploymentPostprocessing = 0;
330330
};
@@ -569,8 +569,8 @@
569569
XCCL26536501 /* Build configuration list for PBXNativeTarget "TestProjectTests" */ = {
570570
isa = XCConfigurationList;
571571
buildConfigurations = (
572-
XCBC60448901 /* Release */,
573572
XCBC89077001 /* Debug */,
573+
XCBC60448901 /* Release */,
574574
);
575575
defaultConfigurationIsVisible = 0;
576576
defaultConfigurationName = "";
@@ -596,8 +596,8 @@
596596
XCCL81399401 /* Build configuration list for PBXProject */ = {
597597
isa = XCConfigurationList;
598598
buildConfigurations = (
599-
XCBC88111401 /* Release */,
600599
XCBC47994501 /* Debug */,
600+
XCBC88111401 /* Release */,
601601
);
602602
defaultConfigurationIsVisible = 0;
603603
defaultConfigurationName = Debug;

‎Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ let package = Package(
1515
.package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "3.3.0"),
1616
.package(url: "https://github.com/kylef/Spectre.git", from: "0.7.0"),
1717
.package(url: "https://github.com/onevcat/Rainbow.git", from: "2.1.0"),
18-
.package(url: "https://github.com/swift-xcode/xcodeproj.git", .exact("0.1.1")),
18+
.package(url: "https://github.com/swift-xcode/xcodeproj.git", from: "0.1.2"),
1919
],
2020
targets: [
2121
.target(name: "XcodeGen", dependencies: [

‎Sources/ProjectSpec/ProjectExtensions.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,6 @@ import Foundation
1010
import xcodeproj
1111
import PathKit
1212

13-
extension Array where Element: Referenceable {
14-
15-
public var referenceList: [String] {
16-
return map { $0.reference }
17-
}
18-
19-
public var referenceSet: Set<String> {
20-
return Set(referenceList)
21-
}
22-
}
23-
2413
extension Dictionary where Key == String, Value: Any {
2514

2615
public func merged(_ dictionary: [Key: Value]) -> [Key: Value] {

0 commit comments

Comments
 (0)