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

Merge pull request #536 from yonaskolb/xcodeproj_6.6

Browse Source 
Update to xcodeproj 6.7
This commit is contained in:
Yonas Kolb
2019-04-02 22:13:57 +11:00
committed by GitHub
parent 6b431a204d 036c68885a
commit b5d17b5b51
7 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+6
View File
@@ -2,6 +2,12 @@
## Next Version
#### Added
- Added support for `app-extension.intents-service` target type [#536](https://github.com/yonaskolb/XcodeGen/pull/536) @yonaskolb
#### Changed
- Updated to xcodeproj 6.7.0 including its performance improvements [#536](https://github.com/yonaskolb/XcodeGen/pull/536) @yonaskolb
## 2.4.0
#### Fixed:
Docs/ProjectSpec.md
+3 -1
View File
@@ -227,9 +227,10 @@ This will provide default build settings for a certain product type. It can be a
- `application.messages`
- `application.watchapp`
- `application.watchapp2`
- `app-extension`
- `app-extension.messages`
- `app-extension.messages-sticker-pack`
- `app-extension`
- `app-extension.intents-service`
- `bundle`
- `bundle.unit-test`
- `bundle.ui-testing`
@@ -242,6 +243,7 @@ This will provide default build settings for a certain product type. It can be a
- `tv-app-extension`
- `watchkit-extension`
- `watchkit2-extension`
- `xcode-extension`
- `xpc-service`
- ``""`` (used for legacy targets)
Package.resolved
+2 -2
View File
@@ -69,8 +69,8 @@
"repositoryURL": "https://github.com/tuist/xcodeproj.git",
"state": {
"branch": null,
"revision": "8e15cc74149ee946b7ae125685177915b4ff7317",
"version": "6.4.0"
"revision": "065f348754b6155b8037dc43876a8f2ee354b95d",
"version": "6.7.0"
}
},
{
Package.swift
+1 -1
View File
@@ -15,7 +15,7 @@ let package = Package(
.package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.1.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", .exact("6.4.0")),
.package(url: "https://github.com/tuist/xcodeproj.git", .exact("6.7.0")),
.package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "5.2.0"),
],
targets: [
Sources/ProjectSpec/Linkage.swift
+1
View File
@@ -16,6 +16,7 @@ extension Target {
.bundle,
.commandLineTool,
.instrumentsPackage,
.intentsServiceExtension,
.messagesApplication,
.messagesExtension,
.ocUnitTestBundle,
Tests/XcodeGenKitTests/ProjectGeneratorTests.swift
+4 -4
View File
@@ -598,7 +598,7 @@ class ProjectGeneratorTests: XCTestCase {
if let expectedResourceFiles = expectedResourceFiles[target.name] {
try expect(resourcesPhases.count) == (expectedResourceFiles.isEmpty ? 0 : 1)
if !expectedResourceFiles.isEmpty {
let resourceFiles = resourcesPhases[0].files
let resourceFiles = (resourcesPhases[0].files ?? [])
.compactMap { $0.file }
.map { $0.nameOrPath }
try expect(Set(resourceFiles)) == expectedResourceFiles
@@ -611,7 +611,7 @@ class ProjectGeneratorTests: XCTestCase {
let expectedLinkedFiles = expectedLinkedFiles[target.name]!
try expect(frameworkPhases.count) == (expectedLinkedFiles.isEmpty ? 0 : 1)
if !expectedLinkedFiles.isEmpty {
let linkFrameworks = frameworkPhases[0].files
let linkFrameworks = (frameworkPhases[0].files ?? [])
.compactMap { $0.file?.nameOrPath }
try expect(Set(linkFrameworks)) == expectedLinkedFiles
}
@@ -620,7 +620,7 @@ class ProjectGeneratorTests: XCTestCase {
if let expectedEmbeddedFrameworks = expectedEmbeddedFrameworks[target.name] {
try expect(copyFilesPhases.count) == (expectedEmbeddedFrameworks.isEmpty ? 0 : 1)
if !expectedEmbeddedFrameworks.isEmpty {
let copyFiles = copyFilesPhases[0].files
let copyFiles = (copyFilesPhases[0].files ?? [])
.compactMap { $0.file?.nameOrPath }
try expect(Set(copyFiles)) == expectedEmbeddedFrameworks
}
@@ -871,7 +871,7 @@ class ProjectGeneratorTests: XCTestCase {
}
let frameworkPhases = nativeTarget.buildPhases.compactMap { $0 as? PBXFrameworksBuildPhase }
let frameworkBuildFiles = frameworkPhases[0].files
let frameworkBuildFiles = frameworkPhases[0].files ?? []
let buildFileSettings = frameworkBuildFiles.map { $0.settings }
try expect(frameworkBuildFiles.count) == 2
Tests/XcodeGenKitTests/SourceGeneratorTests.swift
+4 -4
View File
@@ -95,8 +95,8 @@ class SourceGeneratorTests: XCTestCase {
.first(where: { $0.file == fileReference }) else {
throw failure("Cant find build file")
}
try expect(buildPhase?.files.count) == 1
try expect(buildPhase?.files.contains(buildFile)) == true
try expect(buildPhase?.files?.count) == 1
try expect(buildPhase?.files?.contains(buildFile)) == true
}
$0.it("generates core data models") {
@@ -518,7 +518,7 @@ class SourceGeneratorTests: XCTestCase {
let sourcesBuildPhase = pbxProj.buildPhases.first(where: { $0.buildPhase == BuildPhase.sources })!
try expect(sourcesBuildPhase.files.count) == 1
try expect(sourcesBuildPhase.files?.count) == 1
}
$0.it("add only carthage dependencies with same platform") {
@@ -609,7 +609,7 @@ extension PBXProj {
let buildFile = buildFiles
.first(where: { $0.file === fileReference })
let actualBuildPhase = buildFile
.flatMap { buildFile in buildPhases.first { $0.files.contains(buildFile) } }?.buildPhase
.flatMap { buildFile in buildPhases.first { $0.files?.contains(buildFile) ?? false } }?.buildPhase
var error: String?
if let buildPhase = buildPhase.buildPhase {