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.

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

Always update input/output paths even if they are empty #7368

Merged
merged 1 commit into from
Jan 25, 2018

Conversation

dnkoutso
Copy link
Contributor

Fixes a case in which a pod input/output path was added but then it does not get removed if the input/output paths are now empty.

This can also occur if someone uses use_frameworks! and switches out to static libs.

@dnkoutso dnkoutso force-pushed the always_update_paths branch 3 times, most recently from 7cc25f4 to d7dde05 Compare January 25, 2018 20:28
@@ -111,16 +107,12 @@ def remove_embed_frameworks_script_phase_from_target(native_target)
#
# @return [void]
#
def add_copy_resources_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
def create_or_update_copy_resources_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just renamed method to match better what it actually does.

@@ -71,15 +71,11 @@ class << self
#
# @return [void]
#
def add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
def create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just renamed method to match better what it actually does.

@dnkoutso dnkoutso modified the milestones: 1.6.0, 1.5.0 Jan 25, 2018
@dnkoutso dnkoutso merged commit ae76d12 into CocoaPods:master Jan 25, 2018
@dnkoutso dnkoutso deleted the always_update_paths branch January 25, 2018 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants