New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Support for DocC in Xcode 13 #1091
Merged
Merged
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
DocC "files" are actually folders `.docc` appended to the name, but Xcode 13 treats them differently. Therefore, we need to exclude them from the normal BuildPhase. Resolves yonaskolb#1089
Expanded an existing test to include .docc support. Also added a .docc catalog to the Test Project.
yonaskolb
approved these changes
Jun 16, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All looks great, thank you @brevansio!
vgorloff
added a commit
to vgorloff/XcodeGen
that referenced
this pull request
Jun 17, 2021
commit 0bcdce0d1f0f1d13fb5a284404e4eaea4e805a89 Author: Vlad Gorlov <volodymyr.gorlov@gmail.com> Date: Fri Jun 18 00:58:50 2021 +0200 [yonaskolb#1092] Dependency version update. commit 0040c46fd4ce9f42102faeb744104027b6c2c757 Author: Bruce Evans <bruce.evans.dev@gmail.com> Date: Wed Jun 16 09:12:01 2021 +0900 Add Support for DocC in Xcode 13 (yonaskolb#1091) * Add support for DocC DocC "files" are actually folders `.docc` appended to the name, but Xcode 13 treats them differently. Therefore, we need to exclude them from the normal BuildPhase. Resolves yonaskolb#1089 * Add tests for DocC Expanded an existing test to include .docc support. Also added a .docc catalog to the Test Project. * Update changelog.md * Update changelog.md to get the correct PR Link commit 5bb7ef4e1c632f80f63c49ee280d64b8dab1603f Author: Vlad Gorlov <volodymyr.gorlov@gmail.com> Date: Wed Jun 16 01:03:42 2021 +0200 Added support for missed product types. commit 3f8bfdf749d0d15da8490550b95a31cf961d8649 Author: Vlad Gorlov <volodymyr.gorlov@gmail.com> Date: Wed Jun 16 00:01:47 2021 +0200 Added support for missed product types. commit 235ebe4fe906716a6a37421346318fc6515836ce Author: Vlad Gorlov <volodymyr.gorlov@gmail.com> Date: Tue Jun 15 23:53:52 2021 +0200 Added support for missed product types.
yonaskolb
pushed a commit
that referenced
this pull request
Jun 20, 2021
…ypes (#1094) * Squashed commit of the following: commit 0bcdce0d1f0f1d13fb5a284404e4eaea4e805a89 Author: Vlad Gorlov <volodymyr.gorlov@gmail.com> Date: Fri Jun 18 00:58:50 2021 +0200 [#1092] Dependency version update. commit 0040c46fd4ce9f42102faeb744104027b6c2c757 Author: Bruce Evans <bruce.evans.dev@gmail.com> Date: Wed Jun 16 09:12:01 2021 +0900 Add Support for DocC in Xcode 13 (#1091) * Add support for DocC DocC "files" are actually folders `.docc` appended to the name, but Xcode 13 treats them differently. Therefore, we need to exclude them from the normal BuildPhase. Resolves #1089 * Add tests for DocC Expanded an existing test to include .docc support. Also added a .docc catalog to the Test Project. * Update changelog.md * Update changelog.md to get the correct PR Link commit 5bb7ef4e1c632f80f63c49ee280d64b8dab1603f Author: Vlad Gorlov <volodymyr.gorlov@gmail.com> Date: Wed Jun 16 01:03:42 2021 +0200 Added support for missed product types. commit 3f8bfdf749d0d15da8490550b95a31cf961d8649 Author: Vlad Gorlov <volodymyr.gorlov@gmail.com> Date: Wed Jun 16 00:01:47 2021 +0200 Added support for missed product types. commit 235ebe4fe906716a6a37421346318fc6515836ce Author: Vlad Gorlov <volodymyr.gorlov@gmail.com> Date: Tue Jun 15 23:53:52 2021 +0200 Added support for missed product types. * [#1094] Fixes failing tests. * [#1094] Added test project targets. * [#1094] Making iig-file type of source code. * [#1094] Attempt to fix CI failure.
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.
DocC "files" are actually folders
.docc
appended to the name, but Xcode 13 treats them differently. Therefore, we need to exclude them from the normal BuildPhase.Resolves #1089
About the PR:
I'm a little uneasy about the tests. First, I added to an existing test because it seems like the best fit and I have confirmed that it both fails/passes when it should. If I need to move the test code or create a new test instead of modifying the existing test, let me know. Second, I'm also completely lost on the
project.pbxproj
because I couldn't figure out how to get it to fail the diff, so if I did something wrong let me know.