Merge pull request #7638 from dnkoutso/system_module_maps

Remove [system] declaration attribute from generated module maps

(cherry picked from commit 0a93634a)

# Conflicts:
#	spec/cocoapods-integration-specs
parent 6b1d6896
......@@ -13,6 +13,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
* Remove [system] declaration attribute from generated module maps
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7589](https://github.com/CocoaPods/CocoaPods/issues/7589)
* Properly namespace Info.plist names during target installation
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7611](https://github.com/CocoaPods/CocoaPods/pull/7611)
......
......@@ -90,12 +90,9 @@ module Pod
end
# The suffix attributes to `module`.
# Ensures that library module maps are treated as `system` modules,
# supressing warnings when imported, as is done for header imports given via `-isystem`.
#
def module_declaration_attributes
return '' if target.requires_frameworks?
' [system]'
''
end
end
end
......
......@@ -27,7 +27,7 @@ module Pod
@pod_target.stubs(:requires_frameworks?).returns(false)
@gen.save_as(path)
path.read.should == <<-EOS.strip_heredoc
module BananaLib [system] {
module BananaLib {
umbrella header "BananaLib-umbrella.h"
export *
......
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