mirror of
https://github.com/yonaskolb/XcodeGen.git
synced 2024-09-11 12:56:03 +03:00
update to xcodeproj 6.7
This commit is contained in:
parent
fde42399de
commit
16bc081944
@ -69,8 +69,8 @@
|
||||
"repositoryURL": "https://github.com/tuist/xcodeproj.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "3fe1bd763072c81050b867d34db56d11cb9085bb",
|
||||
"version": "6.6.0"
|
||||
"revision": "065f348754b6155b8037dc43876a8f2ee354b95d",
|
||||
"version": "6.7.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -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.6.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: [
|
||||
|
@ -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
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user