Merge branch 'michalkonturek-master'

CHANGELOG.md

@@ -6,12 +6,18 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 ###### Bug Fixes
 
-* Added a condition to avoid compiling xcassets when WRAPPER_EXTENSION
+* Added a condition to avoid compiling xcassets when `WRAPPER_EXTENSION`
   is undefined, as it would be in the case of static libraries. This prevents
   trying to copy the compiled files to a directory that does not exist.
   [Noah McCann](https://github.com/nmccann)
   [#1521](https://github.com/CocoaPods/CocoaPods/pull/1521)
 
+* 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)

lib/cocoapods/generator/copy_resources_script.rb

@@ -137,7 +137,7 @@ EOS
 
       XCASSETS_COMPILE = <<EOS
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `xcrun --find actool` ] && [ `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}"