Unverified Commit 71211b50 authored by Dimitris Koutsogiorgas's avatar Dimitris Koutsogiorgas Committed by GitHub

Merge pull request #7216 from dnkoutso/validator_test_targets_swift

Set `SWIFT_VERSION` to test native targets during validation
parents bddce911 e6246f9a
...@@ -18,6 +18,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -18,6 +18,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### Bug Fixes
* Set `SWIFT_VERSION` to test native targets during validation
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7216](https://github.com/CocoaPods/CocoaPods/pull/7216)
* Add copied resources' paths to "Copy Pods Resources" output file list * Add copied resources' paths to "Copy Pods Resources" output file list
[igor-makarov](https://github.com/igor-makarov) [igor-makarov](https://github.com/igor-makarov)
[#6936](https://github.com/CocoaPods/CocoaPods/issues/6936) [#6936](https://github.com/CocoaPods/CocoaPods/issues/6936)
......
...@@ -478,6 +478,13 @@ module Pod ...@@ -478,6 +478,13 @@ module Pod
(build_configuration.build_settings['OTHER_CFLAGS'] ||= '$(inherited)') << ' -Wincomplete-umbrella' (build_configuration.build_settings['OTHER_CFLAGS'] ||= '$(inherited)') << ' -Wincomplete-umbrella'
build_configuration.build_settings['SWIFT_VERSION'] = swift_version if pod_target.uses_swift? build_configuration.build_settings['SWIFT_VERSION'] = swift_version if pod_target.uses_swift?
end end
if pod_target.uses_swift?
pod_target.test_native_targets.each do |test_native_target|
test_native_target.build_configuration_list.build_configurations.each do |build_configuration|
build_configuration.build_settings['SWIFT_VERSION'] = swift_version
end
end
end
end end
if target.pod_targets.any?(&:uses_swift?) && consumer.platform_name == :ios && if target.pod_targets.any?(&:uses_swift?) && consumer.platform_name == :ios &&
(deployment_target.nil? || Version.new(deployment_target).major < 8) (deployment_target.nil? || Version.new(deployment_target).major < 8)
......
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