Link swiftSwiftOnoneSupport for test xcconfigs
#6769
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
With CocoaPods/Xcodeproj#489, I think this might be closer to what we want diff --git a/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb b/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
index 4ce23fe4..880ab376 100644
--- a/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
+++ b/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
@@ -303,12 +303,20 @@ module Pod
target.test_native_targets.each do |test_target|
test_target.build_configurations.each do |test_target_bc|
+ test_target_swift_debug_hack(test_target, test_target_bc)
test_target_bc.base_configuration_reference = xcconfig_file_ref
end
end
end
end
+ def test_target_swift_debug_hack(test_target, test_target_bc)
+ return unless test_target_bc.debug?
+ return unless [target, *target.recursive_dependent_targets].any?(&:uses_swift?)
+ ldflags = test_target_bc.build_settings['OTHER_LDFLAGS'] ||= ''
+ ldflags << ' -lswiftSwiftOnoneSupport'
+ end
+
# Creates a build phase which links the versioned header folders
# of the OS X into the framework bundle's root root directory.
# This is only necessary because the way how headers are copied |
658ca25 to
6b0f8a5
Compare
diff --git a/Gemfile.lock b/Gemfile.lock
index 871a168e..278ad193 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,7 +31,7 @@ GIT
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
- revision: 7355a4eac5d3634725e0925cfbfa46fbcd88b933
+ revision: 76932aa3dce97408361b0cd485deff9a77e3bcb4
branch: master
specs:
xcodeproj (1.4.4)
@@ -291,4 +291,4 @@ DEPENDENCIES
xcodeproj!
BUNDLED WITH
- 1.14.6
+ 1.15.0
diff --git a/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb b/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
index 4ce23fe4..880ab376 100644
--- a/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
+++ b/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
@@ -303,12 +303,20 @@ module Pod
target.test_native_targets.each do |test_target|
test_target.build_configurations.each do |test_target_bc|
+ test_target_swift_debug_hack(test_target, test_target_bc)
test_target_bc.base_configuration_reference = xcconfig_file_ref
end
end
end
end
+ def test_target_swift_debug_hack(test_target, test_target_bc)
+ return unless test_target_bc.debug?
+ return unless [target, *target.recursive_dependent_targets].any?(&:uses_swift?)
+ ldflags = test_target_bc.build_settings['OTHER_LDFLAGS'] ||= ''
+ ldflags << ' -lswiftSwiftOnoneSupport'
+ end
+
# Creates a build phase which links the versioned header folders
# of the OS X into the framework bundle's root root directory.
# This is only necessary because the way how headers are copied |
e455782 to
0d50aa8
Compare
0d50aa8 to
a4460fb
Compare
|
👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.