Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
65d1fbab
Commit
65d1fbab
authored
Apr 15, 2018
by
Maxime Le Moine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix assetcatalog_generated_info.plist path in copy resources phase
parent
8094d02e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
copy_resources_script.rb
lib/cocoapods/generator/copy_resources_script.rb
+1
-1
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
No files found.
CHANGELOG.md
View file @
65d1fbab
...
...
@@ -44,6 +44,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
View file @
65d1fbab
...
...
@@ -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
...
...
cocoapods-integration-specs
@
4f86cab1
Subproject commit
55202559c1b06409113d2a19b15fb065c3742115
Subproject commit
4f86cab131e1976e613168f25662132b87e4ad3e
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment