Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[CopyResourcesScript] FIX xcassets not compatible with Xcode < 5.0.0. #1511

Closed
wants to merge 3 commits into from
Closed

[CopyResourcesScript] FIX xcassets not compatible with Xcode < 5.0.0. #1511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87b0006
[CopyResourcesScript] FIX xcassets not compatible with Xcode > 5.0.0.
michalkonturek Oct 26, 2013
ced3b73
[CopyResourcesScript] FIX xcassets not compatible with Xcode < 5.0.0.
michalkonturek Oct 31, 2013
429ed60
[CHANGELOG]
michalkonturek Oct 31, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).

## Master

###### Bug Fixes

* Added additional condition to check if `actool` is available when compiling `xcassets`.
This prevents build failures of Xcode 5 projects on Travis CI (or lower Xcode versions).
[Michal Konturek](https://github.com/michalkonturek)
[#1511](https://github.com/CocoaPods/CocoaPods/pull/1511)

## 0.27.1
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.26.2...0.27.1)
• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.26.2...0.27.1)
Expand Down
10 changes: 6 additions & 4 deletions lib/cocoapods/generator/copy_resources_script.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,12 @@ def script

XCASSETS_COMPILE = <<EOS

if [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
then
DEVICE=`if [ "${TARGETED_DEVICE_FAMILY}" -eq 1 ]; then echo "iphone"; else echo "ipad"; fi`
find "${PWD}" -name "*.xcassets" -print0 | xargs -0 actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" --target-device "${DEVICE}" --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}"
if [ `xcrun --find actool` ]; then
if [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
then
DEVICE=`if [ "${TARGETED_DEVICE_FAMILY}" -eq 1 ]; then echo "iphone"; else echo "ipad"; fi`
find "${PWD}" -name "*.xcassets" -print0 | xargs -0 actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" --target-device "${DEVICE}" --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}"
fi
fi
EOS
end
Expand Down