GitHub/XcodeGen
1
0
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2026-03-18 20:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to xcodeproj 6.1.0

Browse Source
This commit is contained in:
Yonas Kolb
2018-10-10 20:06:15 +11:00
parent 9464f5f925
commit 32a36b0e7f
11 changed files with 3547 additions and 3544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Package.resolved
+3 -3
View File
@@ -68,9 +68,9 @@
"package": "xcodeproj",
"repositoryURL": "https://github.com/tuist/xcodeproj.git",
"state": {
"branch": "master",
"revision": "df58e7c581f54512a09587fe519b95caeca57ae1",
"version": null
"branch": null,
"revision": "ed33abf5f983232d5a27ada48d120ad7564a3087",
"version": "6.1.0"
}
},
{
Package.swift
+1 -1
View File
@@ -16,7 +16,7 @@ let package = Package(
.package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.0.0"),
.package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0"),
.package(url: "https://github.com/onevcat/Rainbow.git", from: "3.0.0"),
.package(url: "https://github.com/tuist/xcodeproj.git", .branch("master")),
.package(url: "https://github.com/tuist/xcodeproj.git", from: "6.1.0"),
],
targets: [
.target(name: "XcodeGen", dependencies: [
Sources/XcodeGenKit/PBXProjGenerator.swift
+1 -1
View File
@@ -316,7 +316,7 @@ public class PBXProjGenerator {
guard let target = self.pbxProj.targets(named: name).first else { continue }
// FIX: Can't set in xcproj 5.0+
//targetAttributes[uiTestTarget, default: [:]].merge(["TestTargetID": target.reference])
targetAttributes[uiTestTarget, default: [:]].merge(["TestTargetID": target])
}
func generateTargetAttributes(_ target: ProjectTarget, pbxTarget: PBXTarget) {
Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj
+3510 -3507
View File
File diff suppressed because it is too large Load Diff
Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_iOS Production.xcscheme
+6 -6
View File
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -33,7 +33,7 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8CDD0FC5B69DB55054CAECF513716138"
BlueprintIdentifier = "NT_193BAF154270D1C21E269EDF2A1BD3F6"
BuildableName = "App_iOS_Tests.xctest"
BlueprintName = "App_iOS_Tests"
ReferencedContainer = "container:Project.xcodeproj">
@@ -43,7 +43,7 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B145BCFEB550C3DDF48510BB85CDE8DC"
BlueprintIdentifier = "NT_D4BAEEEC88124103C8DFF41FCE206DCE"
BuildableName = "App_iOS_UITests.xctest"
BlueprintName = "App_iOS_UITests"
ReferencedContainer = "container:Project.xcodeproj">
@@ -53,7 +53,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -86,7 +86,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -115,7 +115,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_iOS Staging.xcscheme
+6 -6
View File
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -33,7 +33,7 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8CDD0FC5B69DB55054CAECF513716138"
BlueprintIdentifier = "NT_193BAF154270D1C21E269EDF2A1BD3F6"
BuildableName = "App_iOS_Tests.xctest"
BlueprintName = "App_iOS_Tests"
ReferencedContainer = "container:Project.xcodeproj">
@@ -43,7 +43,7 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B145BCFEB550C3DDF48510BB85CDE8DC"
BlueprintIdentifier = "NT_D4BAEEEC88124103C8DFF41FCE206DCE"
BuildableName = "App_iOS_UITests.xctest"
BlueprintName = "App_iOS_UITests"
ReferencedContainer = "container:Project.xcodeproj">
@@ -53,7 +53,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -86,7 +86,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -115,7 +115,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_iOS Test.xcscheme
+6 -6
View File
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -33,7 +33,7 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8CDD0FC5B69DB55054CAECF513716138"
BlueprintIdentifier = "NT_193BAF154270D1C21E269EDF2A1BD3F6"
BuildableName = "App_iOS_Tests.xctest"
BlueprintName = "App_iOS_Tests"
ReferencedContainer = "container:Project.xcodeproj">
@@ -43,7 +43,7 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B145BCFEB550C3DDF48510BB85CDE8DC"
BlueprintIdentifier = "NT_D4BAEEEC88124103C8DFF41FCE206DCE"
BuildableName = "App_iOS_UITests.xctest"
BlueprintName = "App_iOS_UITests"
ReferencedContainer = "container:Project.xcodeproj">
@@ -53,7 +53,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -86,7 +86,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -115,7 +115,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DB85CB6A2C15660854D634EF1B0C1FAD"
BlueprintIdentifier = "NT_BEB0891E36797FE2214A0A9D516D408D"
BuildableName = "App_iOS.app"
BlueprintName = "App_iOS"
ReferencedContainer = "container:Project.xcodeproj">
Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_watchOS.xcscheme
+4 -4
View File
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9F21B9C99E75314E51854589C0A2D40C"
BlueprintIdentifier = "NT_38A9FE87056942A2746E0FF025B52A91"
BuildableName = "App_watchOS.app"
BlueprintName = "App_watchOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -32,7 +32,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9F21B9C99E75314E51854589C0A2D40C"
BlueprintIdentifier = "NT_38A9FE87056942A2746E0FF025B52A91"
BuildableName = "App_watchOS.app"
BlueprintName = "App_watchOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -57,7 +57,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9F21B9C99E75314E51854589C0A2D40C"
BlueprintIdentifier = "NT_38A9FE87056942A2746E0FF025B52A91"
BuildableName = "App_watchOS.app"
BlueprintName = "App_watchOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -78,7 +78,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9F21B9C99E75314E51854589C0A2D40C"
BlueprintIdentifier = "NT_38A9FE87056942A2746E0FF025B52A91"
BuildableName = "App_watchOS.app"
BlueprintName = "App_watchOS"
ReferencedContainer = "container:Project.xcodeproj">
Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/Framework.xcscheme
+5 -5
View File
@@ -14,7 +14,7 @@
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FE8D0077B0ADF688264AFA16A3FC213E"
BlueprintIdentifier = "NT_7D108AE86BED8C9CCF52C2646FA4C5DE"
BuildableName = "Framework.framework"
BlueprintName = "Framework_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -32,7 +32,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FE8D0077B0ADF688264AFA16A3FC213E"
BlueprintIdentifier = "NT_7D108AE86BED8C9CCF52C2646FA4C5DE"
BuildableName = "Framework.framework"
BlueprintName = "Framework_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -50,7 +50,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FE8D0077B0ADF688264AFA16A3FC213E"
BlueprintIdentifier = "NT_7D108AE86BED8C9CCF52C2646FA4C5DE"
BuildableName = "Framework.framework"
BlueprintName = "Framework_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -72,7 +72,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FE8D0077B0ADF688264AFA16A3FC213E"
BlueprintIdentifier = "NT_7D108AE86BED8C9CCF52C2646FA4C5DE"
BuildableName = "Framework.framework"
BlueprintName = "Framework_iOS"
ReferencedContainer = "container:Project.xcodeproj">
@@ -101,7 +101,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FE8D0077B0ADF688264AFA16A3FC213E"
BlueprintIdentifier = "NT_7D108AE86BED8C9CCF52C2646FA4C5DE"
BuildableName = "Framework.framework"
BlueprintName = "Framework_iOS"
ReferencedContainer = "container:Project.xcodeproj">
Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/iMessageApp.xcscheme
+4 -4
View File
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "24B389B0959F4A6CB05BB732DABDFE40"
BlueprintIdentifier = "NT_6BD068FAAC6AA35C090C48147B94EC6E"
BuildableName = "iMessageApp.app"
BlueprintName = "iMessageApp"
ReferencedContainer = "container:Project.xcodeproj">
@@ -32,7 +32,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "24B389B0959F4A6CB05BB732DABDFE40"
BlueprintIdentifier = "NT_6BD068FAAC6AA35C090C48147B94EC6E"
BuildableName = "iMessageApp.app"
BlueprintName = "iMessageApp"
ReferencedContainer = "container:Project.xcodeproj">
@@ -57,7 +57,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "24B389B0959F4A6CB05BB732DABDFE40"
BlueprintIdentifier = "NT_6BD068FAAC6AA35C090C48147B94EC6E"
BuildableName = "iMessageApp.app"
BlueprintName = "iMessageApp"
ReferencedContainer = "container:Project.xcodeproj">
@@ -78,7 +78,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "24B389B0959F4A6CB05BB732DABDFE40"
BlueprintIdentifier = "NT_6BD068FAAC6AA35C090C48147B94EC6E"
BuildableName = "iMessageApp.app"
BlueprintName = "iMessageApp"
ReferencedContainer = "container:Project.xcodeproj">
Tests/XcodeGenKitTests/ProjectGeneratorTests.swift
+1 -1
View File
@@ -262,7 +262,7 @@ class ProjectGeneratorTests: XCTestCase {
throw failure("Couldn't find UITest Target")
}
//try expect(targetAttributes[uiTestTarget.reference]?["TestTargetID"] as? String) == appTarget.reference.value
try expect(targetAttributes[uiTestTarget]?["TestTargetID"] as? String) != nil
try expect(targetAttributes[uiTestTarget]?["ProvisioningStyle"] as? String) == "Manual"
try expect(targetAttributes[appTarget]?["ProvisioningStyle"] as? String) == "Automatic"
try expect(targetAttributes[appTarget]?["DevelopmentTeam"] as? String) == "123"