Skip to content

C
cocoapods
Commit 3fc83c83 authored by Ben Asher's avatar Ben Asher
Browse files
Options

embed fixes

parent 32e84e15
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 10 deletions
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @ 3fc83c83
...@@ -109,17 +109,14 @@ module Pod ...@@ -109,17 +109,14 @@ module Pod
swift_version = Gem::Version.new(target_swift_version) swift_version = Gem::Version.new(target_swift_version)
should_embed = !target.requires_host_target? && pod_targets.any?(&:uses_swift?) should_embed = !target.requires_host_target? && pod_targets.any?(&:uses_swift?)
embed_value = should_embed ? 'YES' : 'NO' config = {}
if should_embed
config = { if swift_version >= EMBED_STANDARD_LIBRARIES_MINIMUM_VERSION
'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => embed_value, config['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = 'YES'
'EMBEDDED_CONTENT_CONTAINS_SWIFT' => embed_value, else
} config['EMBEDDED_CONTENT_CONTAINS_SWIFT'] = 'YES'
end
if swift_version >= EMBED_STANDARD_LIBRARIES_MINIMUM_VERSION || !should_embed
config.delete('EMBEDDED_CONTENT_CONTAINS_SWIFT')
end end
config config
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