Fix checking optional group existence relative to the current working dir #1529
+1
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An optional group for a directory that does not exist is omitted as a source from the project. Unfortunately, there's a small bug in this check, and xcodegen actually checks for the group's existence relative to the current working directory. If you're running xcodegen from another directory than your project spec, this can mean that the optional directory is incorrectly detected as nonexistant and it is omitted from the project.
To fix, we just need to check the group's existence relative to the project. There's already even a convenient local variable for this, so using it means less code than before.
XcodeGen/Sources/XcodeGenKit/SourceGenerator.swift
Line 607 in 5644662
After this PR, optional groups are no longer skipped when generating projects from a different directory.