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

Browse Source
This commit is contained in:
Yonas Kolb
2018-09-25 23:38:38 +10:00
parent e97b002655
commit 84f1c65632
15 changed files with 326 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/XcodeGenKitTests/GeneratorHelpers.swift
+4 -4
View File
@@ -32,12 +32,12 @@ extension PBXProj {
let mainGroup = try getMainGroup()
func validateGroup(_ group: PBXGroup) throws {
let hasDuplicatedChildren = group.childrenReferences.count != Set(group.childrenReferences).count
let hasDuplicatedChildren = group.children.count != Set(group.children).count
if hasDuplicatedChildren {
throw failure("Group \"\(group.nameOrPath)\" has duplicated children:\n - \(group.childrenReferences.map { String(describing: $0) }.joined(separator: "\n - "))")
throw failure("Group \"\(group.nameOrPath)\" has duplicated children:\n - \(group.children.map { String(describing: $0) }.joined(separator: "\n - "))")
}
for child in group.childrenReferences {
if let group = objects.groups.getReference(child) {
for child in group.children {
if let group = child as? PBXGroup {
try validateGroup(group)
}
}
Tests/XcodeGenKitTests/ProjectFixtureTests.swift
+4 -4
View File
@@ -20,11 +20,11 @@ class ProjectFixtureTests: XCTestCase {
guard let xcodeProject = xcodeProject else { return }
func getFileReferences(_ path: String) -> [PBXFileReference] {
return xcodeProject.pbxproj.objects.fileReferences.values.filter { $0.path == path }
return xcodeProject.pbxproj.fileReferences.filter { $0.path == path }
}
func getVariableGroups(_ name: String?) -> [PBXVariantGroup] {
return xcodeProject.pbxproj.objects.variantGroups.values.filter { $0.name == name }
return xcodeProject.pbxproj.variantGroups.filter { $0.name == name }
}
let resourceName = "LocalizedStoryboard.storyboard"
@@ -36,13 +36,13 @@ class ProjectFixtureTests: XCTestCase {
do {
let refs = getFileReferences(baseResource)
try expect(refs.count) == 1
try expect(variableGroup.childrenReferences.filter { $0 == refs.first?.reference }.count) == 1
try expect(variableGroup.children.filter { $0 == refs.first }.count) == 1
}
do {
let refs = getFileReferences(localizedResource)
try expect(refs.count) == 1
try expect(variableGroup.childrenReferences.filter { $0 == refs.first?.reference }.count) == 1
try expect(variableGroup.children.filter { $0 == refs.first }.count) == 1
}
}
Tests/XcodeGenKitTests/ProjectGeneratorTests.swift
+60 -66
View File
@@ -41,11 +41,9 @@ class ProjectGeneratorTests: XCTestCase {
let options = SpecOptions(bundleIdPrefix: "com.test")
let project = Project(basePath: "", name: "test", targets: [framework], options: options)
let pbxProj = try project.generatePbxProj()
guard let target = pbxProj.objects.nativeTargets.first?.value,
let buildConfigList = target.buildConfigurationListReference,
let buildConfigs = pbxProj.objects.configurationLists.getReference(buildConfigList),
let buildConfigReference = buildConfigs.buildConfigurationsReferences.first,
let buildConfig = pbxProj.objects.buildConfigurations.getReference(buildConfigReference) else {
guard let target = pbxProj.nativeTargets.first,
let buildConfigList = target.buildConfigurationList,
let buildConfig = buildConfigList.buildConfigurations.first else {
throw failure("Build Config not found")
}
try expect(buildConfig.buildSettings["PRODUCT_BUNDLE_IDENTIFIER"] as? String) == "com.test.MyFramework"
@@ -55,7 +53,7 @@ class ProjectGeneratorTests: XCTestCase {
let options = SpecOptions(settingPresets: .none)
let project = Project(basePath: "", name: "test", targets: [framework], options: options)
let pbxProj = try project.generatePbxProj()
let allSettings = pbxProj.objects.buildConfigurations.values.reduce([:]) { $0.merged($1.buildSettings) }.keys.sorted()
let allSettings = pbxProj.buildConfigurations.reduce([:]) { $0.merged($1.buildSettings) }.keys.sorted()
try expect(allSettings) == ["SETTING_2"]
}
@@ -63,7 +61,7 @@ class ProjectGeneratorTests: XCTestCase {
let options = SpecOptions(developmentLanguage: "de")
let project = Project(basePath: "", name: "test", options: options)
let pbxProj = try project.generatePbxProj()
guard let pbxProject = pbxProj.objects.projects.first?.value else {
guard let pbxProject = pbxProj.projects.first else {
throw failure("Could't find PBXProject")
}
try expect(pbxProject.developmentRegion) == "de"
@@ -92,8 +90,8 @@ class ProjectGeneratorTests: XCTestCase {
let project = Project(basePath: "", name: "test", configs: [Config(name: "Aconfig"), Config(name: "Bconfig")], targets: [framework], options: options)
let pbxProject = try project.generatePbxProj()
guard let projectConfigListReference = pbxProject.objects.projects.values.first?.buildConfigurationListReference,
let defaultConfigurationName = pbxProject.objects.configurationLists[projectConfigListReference]?.defaultConfigurationName
guard let projectConfigList = pbxProject.projects.first?.buildConfigurationList,
let defaultConfigurationName = projectConfigList.defaultConfigurationName
else {
throw failure("Default configuration name not found")
}
@@ -109,7 +107,7 @@ class ProjectGeneratorTests: XCTestCase {
$0.it("generates config defaults") {
let project = Project(basePath: "", name: "test")
let pbxProj = try project.generatePbxProj()
let configs = pbxProj.objects.buildConfigurations.valueArray
let configs = pbxProj.buildConfigurations
try expect(configs.count) == 2
try expect(configs).contains(name: "Debug")
try expect(configs).contains(name: "Release")
@@ -122,7 +120,7 @@ class ProjectGeneratorTests: XCTestCase {
configs: [Config(name: "config1"), Config(name: "config2")]
)
let pbxProj = try project.generatePbxProj()
let configs = pbxProj.objects.buildConfigurations.valueArray
let configs = pbxProj.buildConfigurations
try expect(configs.count) == 2
try expect(configs).contains(name: "config1")
try expect(configs).contains(name: "config2")
@@ -135,7 +133,7 @@ class ProjectGeneratorTests: XCTestCase {
configs: [Config(name: "config")]
)
let pbxProj = try project.generatePbxProj()
guard let config = pbxProj.objects.buildConfigurations.first?.value else {
guard let config = pbxProj.buildConfigurations.first else {
throw failure("configuration not found")
}
try expect(config.buildSettings.isEmpty).to.beTrue()
@@ -198,8 +196,8 @@ class ProjectGeneratorTests: XCTestCase {
$0.it("generates aggregate targets") {
let pbxProject = try project.generatePbxProj()
let nativeTargets = pbxProject.objects.nativeTargets.valueArray.sorted { $0.name < $1.name }
let aggregateTargets = pbxProject.objects.aggregateTargets.valueArray.sorted { $0.name < $1.name }
let nativeTargets = pbxProject.nativeTargets.sorted { $0.name < $1.name }
let aggregateTargets = pbxProject.aggregateTargets.sorted { $0.name < $1.name }
try expect(nativeTargets.count) == 4
try expect(aggregateTargets.count) == 2
@@ -216,7 +214,7 @@ class ProjectGeneratorTests: XCTestCase {
let target2 = nativeTargets.first { $0.name == "Other2" }
try expect(target2?.dependencies.count) == 2
try expect(pbxProject.objects.targetDependencies.count) == 7
try expect(pbxProject.targetDependencies.count) == 7
}
}
}
@@ -228,7 +226,7 @@ class ProjectGeneratorTests: XCTestCase {
$0.it("generates targets") {
let pbxProject = try project.generatePbxProj()
let nativeTargets = pbxProject.objects.nativeTargets.values
let nativeTargets = pbxProject.nativeTargets
try expect(nativeTargets.count) == 3
try expect(nativeTargets.contains { $0.name == app.name }).beTrue()
try expect(nativeTargets.contains { $0.name == framework.name }).beTrue()
@@ -245,22 +243,22 @@ class ProjectGeneratorTests: XCTestCase {
let project = Project(basePath: "", name: "test", targets: [appTargetWithAttributes, framework, testTargetWithAttributes])
let pbxProject = try project.generatePbxProj()
guard let targetAttributes = pbxProject.objects.projects.values.first?.attributes["TargetAttributes"] as? [PBXObjectReference: [String: Any]] else {
guard let targetAttributes = pbxProject.projects.first?.targetAttributes else {
throw failure("Couldn't find Project TargetAttributes")
}
guard let appTarget = pbxProject.objects.targets(named: app.name).first else {
guard let appTarget = pbxProject.targets(named: app.name).first else {
throw failure("Couldn't find App Target")
}
guard let uiTestTarget = pbxProject.objects.targets(named: uiTest.name).first else {
guard let uiTestTarget = pbxProject.targets(named: uiTest.name).first else {
throw failure("Couldn't find UITest Target")
}
//try expect(targetAttributes[uiTestTarget.reference]?["TestTargetID"] as? String) == appTarget.reference.value
try expect(targetAttributes[uiTestTarget.reference]?["ProvisioningStyle"] as? String) == "Manual"
try expect(targetAttributes[appTarget.reference]?["ProvisioningStyle"] as? String) == "Automatic"
try expect(targetAttributes[appTarget.reference]?["DevelopmentTeam"] as? String) == "123"
try expect(targetAttributes[uiTestTarget]?["ProvisioningStyle"] as? String) == "Manual"
try expect(targetAttributes[appTarget]?["ProvisioningStyle"] as? String) == "Automatic"
try expect(targetAttributes[appTarget]?["DevelopmentTeam"] as? String) == "123"
}
$0.it("generates platform version") {
@@ -269,16 +267,14 @@ class ProjectGeneratorTests: XCTestCase {
let pbxProject = try project.generatePbxProj()
guard let projectConfigListReference = pbxProject.objects.projects.values.first?.buildConfigurationListReference,
let projectConfigReference = pbxProject.objects.configurationLists[projectConfigListReference]?.buildConfigurationsReferences.first,
let projectConfig = pbxProject.objects.buildConfigurations[projectConfigReference]
guard let projectConfigList = pbxProject.projects.first?.buildConfigurationList,
let projectConfig = projectConfigList.buildConfigurations.first
else {
throw failure("Couldn't find Project config")
}
guard let targetConfigListReference = pbxProject.objects.nativeTargets.values.first?.buildConfigurationListReference,
let targetConfigReference = pbxProject.objects.configurationLists[targetConfigListReference]?.buildConfigurationsReferences.first,
let targetConfig = pbxProject.objects.buildConfigurations[targetConfigReference]
guard let targetConfigList = pbxProject.nativeTargets.first?.buildConfigurationList,
let targetConfig = targetConfigList.buildConfigurations.first
else {
throw failure("Couldn't find Target config")
}
@@ -295,14 +291,14 @@ class ProjectGeneratorTests: XCTestCase {
$0.it("generates dependencies") {
let pbxProject = try project.generatePbxProj()
let nativeTargets = pbxProject.objects.nativeTargets.values
let dependencies = pbxProject.objects.targetDependencies.valueArray.sorted { (try? $0.target())??.name ?? "" < (try? $1.target())??.name ?? "" }
let nativeTargets = pbxProject.nativeTargets
let dependencies = pbxProject.targetDependencies.sorted { $0.target?.name ?? "" < $1.target?.name ?? "" }
try expect(dependencies.count) == 2
let appTarget = nativeTargets.first { $0.object.name == app.name }
let frameworkTarget = nativeTargets.first { $0.object.name == framework.name }
let appTarget = nativeTargets.first { $0.name == app.name }
let frameworkTarget = nativeTargets.first { $0.name == framework.name }
try expect(dependencies).contains { $0.object.target == appTarget?.reference }
try expect(dependencies).contains { $0.object.target == frameworkTarget?.reference }
try expect(dependencies).contains { $0.target == appTarget }
try expect(dependencies).contains { $0.target == frameworkTarget }
}
$0.it("generates targets with correct transitive embeds") {
@@ -542,20 +538,21 @@ class ProjectGeneratorTests: XCTestCase {
let pbxProject = try project.generatePbxProj()
for target in targets {
guard let nativeTarget = pbxProject.objects.nativeTargets.values.first(where: { $0.name == target.name }) else {
guard let nativeTarget = pbxProject.nativeTargets.first(where: { $0.name == target.name }) else {
throw failure("PBXNativeTarget for \(target) not found")
}
let buildPhases = nativeTarget.buildPhasesReferences
let resourcesPhases = pbxProject.objects.resourcesBuildPhases.values.filter { buildPhases.contains($0.reference) }
let frameworkPhases = pbxProject.objects.frameworksBuildPhases.values.filter { buildPhases.contains($0.reference) }
let copyFilesPhases = pbxProject.objects.copyFilesBuildPhases.values.filter { buildPhases.contains($0.reference) }
let buildPhases = nativeTarget.buildPhases
let resourcesPhases = pbxProject.resourcesBuildPhases.filter { buildPhases.contains($0) }
let frameworkPhases = pbxProject.frameworksBuildPhases.filter { buildPhases.contains($0) }
let copyFilesPhases = pbxProject.copyFilesBuildPhases.filter { buildPhases.contains($0) }
// ensure only the right resources are copies, no more, no less
let expectedResourceFiles = expectedResourceFiles[target.name]!
try expect(resourcesPhases.count) == (expectedResourceFiles.isEmpty ? 0 : 1)
if !expectedResourceFiles.isEmpty {
let resourceFiles = resourcesPhases[0].fileReferences
.compactMap { pbxProject.objects.buildFiles[$0]?.fileReference.flatMap { pbxProject.objects.fileReferences[$0]?.nameOrPath } }
let resourceFiles = resourcesPhases[0].files
.compactMap { $0.file }
.map { $0.nameOrPath }
try expect(Set(resourceFiles)) == expectedResourceFiles
}
@@ -563,8 +560,8 @@ class ProjectGeneratorTests: XCTestCase {
let expectedLinkedFiles = expectedLinkedFiles[target.name]!
try expect(frameworkPhases.count) == (expectedLinkedFiles.isEmpty ? 0 : 1)
if !expectedLinkedFiles.isEmpty {
let linkFrameworks = frameworkPhases[0].fileReferences
.compactMap { pbxProject.objects.buildFiles[$0]?.fileReference.flatMap { pbxProject.objects.fileReferences[$0]?.nameOrPath } }
let linkFrameworks = frameworkPhases[0].files
.compactMap { $0.file?.nameOrPath }
try expect(Set(linkFrameworks)) == expectedLinkedFiles
}
@@ -572,8 +569,8 @@ class ProjectGeneratorTests: XCTestCase {
let expectedEmbeddedFrameworks = expectedEmbeddedFrameworks[target.name]!
try expect(copyFilesPhases.count) == (expectedEmbeddedFrameworks.isEmpty ? 0 : 1)
if !expectedEmbeddedFrameworks.isEmpty {
let copyFiles = copyFilesPhases[0].fileReferences
.compactMap { pbxProject.objects.buildFiles[$0]?.fileReference.flatMap { pbxProject.objects.fileReferences[$0]?.nameOrPath } }
let copyFiles = copyFilesPhases[0].files
.compactMap { $0.file?.nameOrPath }
try expect(Set(copyFiles)) == expectedEmbeddedFrameworks
}
}
@@ -640,11 +637,9 @@ class ProjectGeneratorTests: XCTestCase {
let pbxProj = try project.generatePbxProj()
func buildSettings(for target: Target) throws -> BuildSettings {
guard let nativeTarget = pbxProj.objects.targets(named: target.name).first,
let buildConfigList = nativeTarget.buildConfigurationListReference,
let buildConfigs = pbxProj.objects.configurationLists.getReference(buildConfigList),
let buildConfigReference = buildConfigs.buildConfigurationsReferences.first,
let buildConfig = pbxProj.objects.buildConfigurations.getReference(buildConfigReference) else {
guard let nativeTarget = pbxProj.targets(named: target.name).first,
let buildConfigList = nativeTarget.buildConfigurationList,
let buildConfig = buildConfigList.buildConfigurations.first else {
throw failure("XCBuildConfiguration not found for Target \(target.name.quoted)")
}
@@ -698,16 +693,15 @@ class ProjectGeneratorTests: XCTestCase {
let pbxProject = try project.generatePbxProj()
func scriptBuildPhases(target: Target) throws -> [PBXShellScriptBuildPhase] {
guard let nativeTarget = pbxProject.objects.nativeTargets.values.first(where: { $0.name == target.name }) else {
guard let nativeTarget = pbxProject.nativeTargets.first(where: { $0.name == target.name }) else {
throw failure("PBXNativeTarget for \(target) not found")
}
let buildPhases = nativeTarget.buildPhasesReferences
let scriptPhases = pbxProject.objects.shellScriptBuildPhases.values.filter { buildPhases.contains($0.reference) }
let buildPhases = nativeTarget.buildPhases
let scriptPhases = buildPhases.compactMap { $0 as? PBXShellScriptBuildPhase }
return scriptPhases
}
let expectedScriptPhase = PBXShellScriptBuildPhase(
fileReferences: [],
name: "Copy Swift Objective-C Interface Header",
inputPaths: ["$(DERIVED_SOURCES_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)"],
outputPaths: ["$(BUILT_PRODUCTS_DIR)/include/$(PRODUCT_MODULE_NAME)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)"],
@@ -726,18 +720,18 @@ class ProjectGeneratorTests: XCTestCase {
scriptSpec.targets[0].postbuildScripts = [BuildScript(script: .script("script2"))]
let pbxProject = try scriptSpec.generatePbxProj()
guard let nativeTarget = pbxProject.objects.nativeTargets.values
.first(where: { $0.buildPhasesReferences.count >= 2 }) else {
guard let nativeTarget = pbxProject.nativeTargets
.first(where: { $0.buildPhases.count >= 2 }) else {
throw failure("Target with build phases not found")
}
let buildPhases = nativeTarget.buildPhasesReferences
let buildPhases = nativeTarget.buildPhases
let scripts = pbxProject.objects.shellScriptBuildPhases.valueArray
let scripts = pbxProject.shellScriptBuildPhases
let script1 = scripts.first { $0.shellScript == "script1" }
let script2 = scripts.first { $0.shellScript == "script2" }
try expect(scripts.count) == 2
try expect(buildPhases.first) == script1?.reference
try expect(buildPhases.last) == script2?.reference
try expect(buildPhases.first) == script1
try expect(buildPhases.last) == script2
}
$0.it("generates targets with cylical dependencies") {
@@ -779,7 +773,7 @@ class ProjectGeneratorTests: XCTestCase {
]
let pbxProject = try scriptSpec.generatePbxProj()
let buildRules = pbxProject.objects.buildRules.values
let buildRules = pbxProject.buildRules
try expect(buildRules.count) == 2
let first = buildRules.first { $0.name == "My Rule" }!
let second = buildRules.first { $0.name != "My Rule" }!
@@ -821,7 +815,7 @@ class ProjectGeneratorTests: XCTestCase {
schemes: [scheme]
)
let xcodeProject = try project.generateXcodeProject()
guard let target = xcodeProject.pbxproj.objects.nativeTargets.values
guard let target = xcodeProject.pbxproj.nativeTargets
.first(where: { $0.name == app.name }) else {
throw failure("Target not found")
}
@@ -848,7 +842,7 @@ class ProjectGeneratorTests: XCTestCase {
].compactMap { $0 }
for buildableReference in buildableReferences {
try expect(buildableReference.blueprintIdentifier) == target.reference
//FIXME: try expect(buildableReference.blueprintIdentifier) == target.reference
try expect(buildableReference.blueprintName) == target.name
try expect(buildableReference.buildableName) == "\(target.name).\(target.productType!.fileExtension!)"
}
@@ -886,7 +880,7 @@ class ProjectGeneratorTests: XCTestCase {
}
try expect(
xcodeProject.pbxproj.objects.nativeTargets.values
xcodeProject.pbxproj.nativeTargets
.contains(where: { $0.name == app.name })
).beTrue()
try expect(xcscheme.launchAction?.environmentVariables) == runVariables
@@ -910,7 +904,7 @@ class ProjectGeneratorTests: XCTestCase {
try expect(xcodeProject.sharedData?.schemes.count) == 2
guard let nativeTarget = xcodeProject.pbxproj.objects.nativeTargets.values
guard let nativeTarget = xcodeProject.pbxproj.nativeTargets
.first(where: { $0.name == app.name }) else {
throw failure("Target not found")
}
@@ -922,7 +916,7 @@ class ProjectGeneratorTests: XCTestCase {
throw failure("Build Action entry not found")
}
try expect(buildActionEntry.buildableReference.blueprintIdentifier) == nativeTarget.reference
//FIXME: try expect(buildActionEntry.buildableReference.blueprintIdentifier) == nativeTarget
try expect(xcscheme.launchAction?.buildConfiguration) == "Test Debug"
try expect(xcscheme.testAction?.buildConfiguration) == "Test Debug"
Tests/XcodeGenKitTests/SourceGeneratorTests.swift
+23 -29
View File
@@ -85,18 +85,18 @@ class SourceGeneratorTests: XCTestCase {
let project = Project(basePath: directoryPath, name: "Test", targets: [target])
let pbxProj = try project.generatePbxProj()
try pbxProj.expectFile(paths: ["Sources", "Bar.swift"], buildPhase: .sources)
let buildPhase = pbxProj.objects.copyFilesBuildPhases.values.first
let buildPhase = pbxProj.copyFilesBuildPhases.first
try expect(buildPhase?.dstSubfolderSpec) == .frameworks
let fileReference = pbxProj.getFileReference(
paths: ["Sources", "Foo.framework"],
names: ["Sources", "Foo.framework"]
)?.reference
guard let buildFile = pbxProj.objects.buildFiles.valueArray
.first(where: { $0.fileReference == fileReference })?.reference else {
)
guard let buildFile = pbxProj.buildFiles
.first(where: { $0.file == fileReference }) else {
throw failure("Cant find build file")
}
try expect(buildPhase?.fileReferences.count) == 1
try expect(buildPhase?.fileReferences.contains(buildFile)) == true
try expect(buildPhase?.files.count) == 1
try expect(buildPhase?.files.contains(buildFile)) == true
}
$0.it("generates core data models") {
@@ -114,16 +114,16 @@ class SourceGeneratorTests: XCTestCase {
let project = Project(basePath: directoryPath, name: "Test", targets: [target])
let pbxProj = try project.generatePbxProj()
guard let fileReference = pbxProj.objects.fileReferences.first(where: { $0.value.nameOrPath == "model2.xcdatamodel" }) else {
guard let fileReference = pbxProj.fileReferences.first(where: { $0.nameOrPath == "model2.xcdatamodel" }) else {
throw failure("Couldn't find model file reference")
}
guard let versionGroup = pbxProj.objects.versionGroups.values.first else {
guard let versionGroup = pbxProj.versionGroups.first else {
throw failure("Couldn't find version group")
}
try expect(versionGroup.currentVersion) == fileReference.key
try expect(versionGroup.childrenReferences.count) == 3
try expect(versionGroup.currentVersion) == fileReference
try expect(versionGroup.children.count) == 3
try expect(versionGroup.path) == "model.xcdatamodeld"
try expect(fileReference.value.path) == "model2.xcdatamodel"
try expect(fileReference.path) == "model2.xcdatamodel"
}
$0.it("handles duplicate names") {
@@ -460,11 +460,9 @@ class SourceGeneratorTests: XCTestCase {
let pbxProj = try project.generatePbxProj()
try pbxProj.expectFile(paths: ["Sources/A", "a.swift"], names: ["A", "a.swift"], buildPhase: .sources)
let sourcesBuildPhase = pbxProj.objects.buildPhases
.first(where: { $0.1.buildPhase == BuildPhase.sources })!
.value
let sourcesBuildPhase = pbxProj.buildPhases.first(where: { $0.buildPhase == BuildPhase.sources })!
try expect(sourcesBuildPhase.fileReferences.count) == 1
try expect(sourcesBuildPhase.files.count) == 1
}
$0.it("derived directories are sorted last") {
@@ -482,7 +480,7 @@ class SourceGeneratorTests: XCTestCase {
let project = Project(basePath: directoryPath, name: "Test", targets: [target])
let pbxProj = try project.generatePbxProj()
let groups = try pbxProj.getMainGroup().childrenReferences.compactMap { pbxProj.objects.getFileElement(reference: $0)?.nameOrPath }
let groups = try pbxProj.getMainGroup().children.map { $0.nameOrPath }
try expect(groups) == ["A", "P", "S", "Frameworks", "Products"]
}
@@ -506,8 +504,8 @@ class SourceGeneratorTests: XCTestCase {
let pbxProj = try project.generatePbxProj()
let mainGroup = try pbxProj.getMainGroup()
let group = mainGroup.childrenReferences.compactMap { pbxProj.objects.groups[$0]}.first { $0.nameOrPath == "Sources" }!
let names = group.childrenReferences.compactMap { pbxProj.objects.getFileElement(reference: $0)?.nameOrPath }
let group = mainGroup.children.compactMap { $0 as? PBXGroup }.first { $0.nameOrPath == "Sources" }!
let names = group.children.compactMap { $0.nameOrPath }
try expect(names) == [
"1file.a",
"10file.a",
@@ -535,10 +533,10 @@ extension PBXProj {
}
if let buildPhase = buildPhase {
let buildFile = objects.buildFiles.values
.first(where: { $0.fileReference == fileReference.reference })
let buildFile = buildFiles
.first(where: { $0.file == fileReference })
let actualBuildPhase = buildFile
.flatMap { buildFile in objects.buildPhases.values.first { $0.fileReferences.contains(buildFile.reference) } }?.buildPhase
.flatMap { buildFile in buildPhases.first { $0.files.contains(buildFile) } }?.buildPhase
var error: String?
if let buildPhase = buildPhase.buildPhase {
@@ -567,17 +565,13 @@ extension PBXProj {
}
func getFileReference(paths: [String], names: [String], file: String = #file, line: Int = #line) -> PBXFileReference? {
guard let project = objects.projects.first?.value else { return nil }
guard let mainGroup = objects.groups.getReference(project.mainGroupReference) else { return nil }
guard let mainGroup = projects.first?.mainGroup else { return nil }
return getFileReference(group: mainGroup, paths: paths, names: names)
}
func getMainGroup(function: String = #function, file: String = #file, line: Int = #line) throws -> PBXGroup {
guard let project = objects.projects.first?.value else {
throw failure("Couldn't find project", file: file, line: line)
}
guard let mainGroup = objects.groups.getReference(project.mainGroupReference) else {
guard let mainGroup = projects.first?.mainGroup else {
throw failure("Couldn't find main group", file: file, line: line)
}
return mainGroup
@@ -591,10 +585,10 @@ extension PBXProj {
let restOfPath = Array(paths.dropFirst())
let restOfName = Array(names.dropFirst())
if restOfPath.isEmpty {
let fileReferences: [PBXFileReference] = group.childrenReferences.compactMap { self.objects.fileReferences.getReference($0) }
let fileReferences: [PBXFileReference] = group.children.compactMap { $0 as? PBXFileReference }
return fileReferences.first { $0.path == path && $0.nameOrPath == name }
} else {
let groups = group.childrenReferences.compactMap { self.objects.groups.getReference($0) }
let groups = group.children.compactMap { $0 as? PBXGroup }
guard let group = groups.first(where: { $0.path == path && $0.nameOrPath == name }) else { return nil }
return getFileReference(group: group, paths: restOfPath, names: restOfName)
}