[6.3]Check ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS and STRING_CATALOG_GENERATE_SYMBOLS build settings before moving compilation of Asset Catalog and String Catalog into Souece phase#1176
Merged
Conversation
…_GENERATE_SYMBOLS build settings before moving compilation of Asset Catalog and String Catalog into Souece phase
Collaborator
owenv
approved these changes
Mar 10, 2026
Collaborator
|
@swift-ci test |
daveyc123
approved these changes
Mar 10, 2026
Collaborator
|
Tests need a small adjustment for the 6.3 branch: |
Collaborator
|
@swift-ci test |
This file contains hidden or 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.
Same changes as #1174, but targetting
release/6.3.Asset Catalogs and String Catalogs can generate code to allow for easy access to colors, images, and strings. Because of this, their compilation needs to happen in the Sources build phase. When configured to be in a Resources phase, we move them into Sources automatically.
#705 refactored the code to generalize the idea.
By accident, that changed a behavior where build settings to generate these symbols were not taken into account. Before #705, Asset Catalogs were only moved when
ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLSwasYES. After #705, the move happened unconditionally.This PR fixes that by only moving Catalogs to the Sources phase when they actually produce sources to compile.