Commit 43b9b98a authored by Samuel Giddins's avatar Samuel Giddins

Address PR feedback

parent bf7ffd23
...@@ -64,6 +64,10 @@ module Pod ...@@ -64,6 +64,10 @@ module Pod
'PRODUCT_BUNDLE_IDENTIFIER' => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}', 'PRODUCT_BUNDLE_IDENTIFIER' => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}',
'SKIP_INSTALL' => 'YES', 'SKIP_INSTALL' => 'YES',
# Needed to ensure that static libraries won't try to embed the swift stdlib,
# since there's no where to embed in for a static library.
# Not necessary for dynamic frameworks either, since the aggregate targets are never shipped
# on their own, and are always further embedded into an app target.
'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'NO', 'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'NO',
} }
super.merge(settings) super.merge(settings)
......
...@@ -123,7 +123,7 @@ module Pod ...@@ -123,7 +123,7 @@ module Pod
next if non_module_dependencies.empty? next if non_module_dependencies.empty?
error_messages << "The swift pod `#{pod_target.name}` depends upon #{non_module_dependencies.to_sentence}, " \ error_messages << "The swift pod `#{pod_target.name}` depends upon #{non_module_dependencies.map { |d| "`#{d}`" }.to_sentence}, " \
'which do not define modules. ' \ 'which do not define modules. ' \
'To opt into those targets generating module maps '\ 'To opt into those targets generating module maps '\
'(which is necessary to import them from swift when building as static libraries), ' \ '(which is necessary to import them from swift when building as static libraries), ' \
......
...@@ -383,7 +383,7 @@ module Pod ...@@ -383,7 +383,7 @@ module Pod
e.message.should.include <<-EOS.strip_heredoc.strip e.message.should.include <<-EOS.strip_heredoc.strip
[!] The following swift pods cannot yet be integrated as static libraries: [!] The following swift pods cannot yet be integrated as static libraries:
The swift pod `OrangeFramework` depends upon matryoshka, which do not define modules. To opt into those targets generating module maps (which is necessary to import them from swift when building as static libraries), you may add `'DEFINES_MODULE' => 'YES'` to those pods' `pod_target_xcconfig`. The swift pod `OrangeFramework` depends upon `matryoshka`, which do not define modules. To opt into those targets generating module maps (which is necessary to import them from swift when building as static libraries), you may add `'DEFINES_MODULE' => 'YES'` to those pods' `pod_target_xcconfig`.
EOS EOS
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