Commit cb9e2a2e authored by Dimitris Koutsogiorgas's avatar Dimitris Koutsogiorgas Committed by GitHub

Merge pull request #7171 from dnkoutso/swift_language_on_test_targets

Set language to Swift for test native targets if any dependencies use Swift
parents 0714e1d4 b16a3341
...@@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### Bug Fixes
* Set language to Swift for test native targets if any dependencies use Swift
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7170](https://github.com/CocoaPods/CocoaPods/issues/7170)
* Prevent multiple script phases from stripping vendored dSYM * Prevent multiple script phases from stripping vendored dSYM
[Dimitris Koutsogiorgas](https://github.com/dnkoutso) [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7166](https://github.com/CocoaPods/CocoaPods/pull/7166) [#7166](https://github.com/CocoaPods/CocoaPods/pull/7166)
......
...@@ -242,7 +242,7 @@ module Pod ...@@ -242,7 +242,7 @@ module Pod
product_type = target.product_type_for_test_type(test_type) product_type = target.product_type_for_test_type(test_type)
name = target.test_target_label(test_type) name = target.test_target_label(test_type)
platform_name = target.platform.name platform_name = target.platform.name
language = target.uses_swift? ? :swift : :objc language = target.all_test_dependent_targets.any?(&:uses_swift?) ? :swift : :objc
native_test_target = project.new_target(product_type, name, platform_name, deployment_target, nil, language) native_test_target = project.new_target(product_type, name, platform_name, deployment_target, nil, language)
native_test_target.product_reference.name = name native_test_target.product_reference.name = name
...@@ -431,7 +431,7 @@ module Pod ...@@ -431,7 +431,7 @@ module Pod
# #
def test_target_swift_debug_hack(test_target_bc) def test_target_swift_debug_hack(test_target_bc)
return unless test_target_bc.debug? return unless test_target_bc.debug?
return unless [target, *target.recursive_dependent_targets].any?(&:uses_swift?) return unless target.all_test_dependent_targets.any?(&:uses_swift?)
ldflags = test_target_bc.build_settings['OTHER_LDFLAGS'] ||= '$(inherited)' ldflags = test_target_bc.build_settings['OTHER_LDFLAGS'] ||= '$(inherited)'
ldflags << ' -lswiftSwiftOnoneSupport' ldflags << ' -lswiftSwiftOnoneSupport'
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment