Add possiblity to add resources before the sources build phase #1351
Conversation
| } | ||
| } | ||
|
|
||
| if target.resourcesBeforeSourcesBuildPhase { |
There was a problem hiding this comment.
This will add the PBXResourcesBuildPhase before the PBXSourcesBuildPhase if the resourcesBeforeSourcesBuildPhase property is true. I've moved the logic for adding the PBXResourcesBuildPhase to a function to not duplicate it.
| @@ -1652,8 +1652,8 @@ | |||
| isa = PBXNativeTarget; | |||
| buildConfigurationList = 77CE5B5E5DEAC820254D484C /* Build configuration list for PBXNativeTarget "App_macOS" */; | |||
| buildPhases = ( | |||
| 96BB43F4706B031DA45166E8 /* Sources */, | |||
There was a problem hiding this comment.
This change is caused by the added property resourcesBeforeSourcesBuildPhase in Tests/Fixtures/TestProject/project.yml
|
|
||
| let targets = pbxProj.projects.first?.targets | ||
| try expect(targets?.count) == 2 | ||
| try expect(targets?.first?.buildPhases.first).to.beOfType(PBXResourcesBuildPhase.self) |
There was a problem hiding this comment.
This validates that the PBXResourcesBuildPhase is added in front when the property is set.
| resourcesBeforeSourcesBuildPhase: false | ||
| ) | ||
|
|
||
| let swinjectPackage = SwiftPackage.remote(url: "https://github.com/Swinject/Swinject", versionRequirement: .exact("2.8.0")) |
There was a problem hiding this comment.
The swift package isn't part of the test, so we can remove it
| @@ -1083,6 +1083,18 @@ public class PBXProjGenerator { | |||
| } | |||
| } | |||
|
|
|||
| func addresourcesBuildPhase() { | |||
There was a problem hiding this comment.
Just an uppercase "R": addResourcesBuildPhase
Sources/ProjectSpec/Target.swift
Outdated
| @@ -56,6 +56,7 @@ public struct Target: ProjectTarget { | |||
| public var attributes: [String: Any] | |||
| public var productName: String | |||
| public var onlyCopyFilesOnInstall: Bool | |||
| public var resourcesBeforeSourcesBuildPhase: Bool | |||
There was a problem hiding this comment.
Is the name of this property clear enough? Maybe add put for clarity?
| public var resourcesBeforeSourcesBuildPhase: Bool | |
| public var putResourcesBeforeSourcesBuildPhase: Bool |
There was a problem hiding this comment.
Will change it to putResourcesBeforeSourcesBuildPhase.
|
Nice work! Don't forget to:
|
…rcesBuildPhase to make it more clear;
|
Thanks for the feedback. I've resolved all issues. Could you recheck the pull request? |
|
\0/ Nice! |
|
Thank you @yonaskolb for merging! |
Hello, this is my first contribution to this project. Thanks for your project!
Short description
XcodeGen doesn't support reordering the build phases of a target. This PR adds the possibility to move the "add resources" before the "sources build phase".
Background
As noted in #1042 it is sometimes needed to have the resources already moved before building the app to verify the resources compile time. In the same issue @yonaskolb did note that the way to go is adding a property on target. This PR does implement that.
Implementation
resourcesBeforeSourcesBuildPhaseto theTargetobjectPBXProjGeneratorif theresourcesBeforeSourcesBuildPhaseis enabled if so add thePBXResourcesBuildPhasebefore thePBXSourcesBuildPhase.