Only include *.xcassets from Pods #2212
Closed
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
Fixes CocoaPods#1546 If you had multiple xcassets anywhere underneath your root project directory, but were only picking one of them for each build, the `Pods-resources.sh` script would include ALL of them in the build. This could cause resources from the correct xcassets to be overwritten by all the others. Now, `Pods-resources.sh` will only include the xcassets found in `Pods`. All other xcassets can be included in the build by adding them to the Xcode project, as per usual.
| @@ -137,7 +137,7 @@ def script | |||
|
|
|||
| XCASSETS_COMPILE = <<EOS | |||
|
|
|||
| if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `xcrun --find actool` ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ] | |||
| if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `xcrun --find actool` ] && [ `find Pods -name '*.xcassets' | wc -l` -ne 0 ] | |||
|
Is this sufficient to fix #1546 ? It fixes the issue for my own project, but I could be overlooking something. |
|
This is exactly what I've been using. Been working well for about 4 months. I don't have any Pods with their own image archives though. It seems like it will work fine. |
|
@tomdalling I'm going to close this as a duplicate of #2323, I know this PR predates the other. But this patch has a hard-coded |
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.
Fixes #1546
If you had multiple xcassets anywhere underneath your root project directory, but were only picking one of them for each build, the
Pods-resources.shscript would include ALL of them in the build. This could cause resources from the correct xcassets to be overwritten by all the others.Now,
Pods-resources.shwill only include the xcassets found inPods. All other xcassets can be included in the build by adding them to the Xcode project, as per usual.