-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
Re-implement dSYM
copying and stripping to avoid duplicate outputs.
#9547
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looking great! nice work
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb
Outdated
Show resolved
Hide resolved
ad190fa
to
6e2b0c2
Compare
028e1bb
to
b10dabb
Compare
@@ -263,7 +267,9 @@ def create_or_update_shell_script_build_phase(native_target, script_phase_name, | |||
def create_or_update_user_script_phases(script_phases, native_target) | |||
script_phase_names = script_phases.map { |k| k[:name] } | |||
# Delete script phases no longer present in the target. | |||
native_target_script_phases = native_target.shell_script_build_phases.select { |bp| !bp.name.nil? && bp.name.start_with?(USER_BUILD_PHASE_PREFIX) } | |||
native_target_script_phases = native_target.shell_script_build_phases.select do |bp| |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just formatting as line was too long. no changes.
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb
Outdated
Show resolved
Hide resolved
@@ -59,113 +59,103 @@ def generate | |||
# | |||
def script | |||
script = <<-SH.strip_heredoc | |||
#!/bin/sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just updated indentation. I think because I added string interpolation to the mix it broke indentation. Either way no changes here except using the script constants instead.
b10dabb
to
65c6974
Compare
lib/cocoapods/installer/user_project_integrator/target_integrator.rb
Outdated
Show resolved
Hide resolved
b983379
to
db2e3d7
Compare
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb
Outdated
Show resolved
Hide resolved
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb
Outdated
Show resolved
Hide resolved
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb
Show resolved
Hide resolved
db2e3d7
to
6bc5b2f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👏
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb
Show resolved
Hide resolved
I'm getting a build error using New Build System (Xcode
UPD there's also a warning from the build system, not sure if related:
|
Looks like |
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb
Outdated
Show resolved
Hide resolved
9cf0b0f
to
f339988
Compare
9f55cde
to
babcc11
Compare
dSYM
copying and stripping to avoid duplicate outputs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Working great 🎉
9662858
to
702cfe6
Compare
702cfe6
to
c805dde
Compare
Re did it with a file instead but same functionality. Merging. |
@migonin no, this PR only changes the implementation details of how Please keep comments about issues on that issue itself, it's difficult to jump around issues & PRs to follow conversation when its not in one place. |
expect |
dSYMs should have never been treated as objects to "embed" like
.frameworks
all they need is copying and stripping. This PR move those steps into a single target and avoids multiple targets being built producing the same "output" in which Xcode 11 errors out.closes #9185
integration specs: CocoaPods/cocoapods-integration-specs#269