Merge pull request #7637 from MaximeLM/fix_assetcatalog_plist

Fix assetcatalog_generated_info.plist path in copy resources phase

(cherry picked from commit 76c47a81)

# Conflicts:
#	spec/cocoapods-integration-specs

CHANGELOG.md

@@ -37,6 +37,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Liquidsoul](https://github.com/liquidsoul)
   [#7644](https://github.com/CocoaPods/CocoaPods/pull/7644)
 
+* Fix assetcatalog_generated_info.plist path in copy resources phase  
+  [Maxime Le Moine](https://github.com/MaximeLM)
+  [#7590](https://github.com/CocoaPods/CocoaPods/issues/7590)
+
 ## 1.5.0 (2018-04-04)
 
 ##### Enhancements

lib/cocoapods/generator/copy_resources_script.rb

@@ -215,7 +215,7 @@ then
   if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
     printf "%s\\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
   else
-    printf "%s\\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_BUILD_DIR}/assetcatalog_generated_info.plist"
+    printf "%s\\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info.plist"
   fi
 fi
 EOS