Commit 03c1ad44 authored by Samuel Giddins's avatar Samuel Giddins

Add an integration spec that Integrates a pod with static swift libraries and objective c modules

parent 4acf59d4
...@@ -622,7 +622,7 @@ module Pod ...@@ -622,7 +622,7 @@ module Pod
UI.message "- Copying module map file to #{UI.path(path)}" do UI.message "- Copying module map file to #{UI.path(path)}" do
contents = custom_module_map.read contents = custom_module_map.read
unless target.requires_frameworks? unless target.requires_frameworks?
contents.gsub!(/^(\s*)framework\s+(module [^{}]){/, '\1\2 [system] {') contents.gsub!(/^(\s*)framework\s+(module[^{}]+){/, '\1\2[system] {')
end end
generator = Generator::Constant.new(contents) generator = Generator::Constant.new(contents)
update_changed_file(generator, path) update_changed_file(generator, path)
......
Subproject commit b21c05141a790ac307a0ff605d2015e58c173889 Subproject commit ce9fcea6cbeb3d1f2cdc000c204569182cce92b9
...@@ -313,6 +313,11 @@ describe_cli 'pod' do ...@@ -313,6 +313,11 @@ describe_cli 'pod' do
'install --no-repo-update' 'install --no-repo-update'
end end
describe 'Integrates a pod with static swift libraries and objective c modules' do
behaves_like cli_spec 'install_static_swift_modules',
'install --no-repo-update'
end
describe 'Integrates a Pod with circular subspec dependencies' do describe 'Integrates a Pod with circular subspec dependencies' do
behaves_like cli_spec 'install_circular_subspec_dependency', behaves_like cli_spec 'install_circular_subspec_dependency',
'install --no-repo-update' 'install --no-repo-update'
......
...@@ -138,7 +138,7 @@ module Pod ...@@ -138,7 +138,7 @@ module Pod
end end
it 'does not add root public or private header search paths to the xcconfig' do it 'does not add root public or private header search paths to the xcconfig' do
@xcconfig.to_hash['HEADER_SEARCH_PATHS'].should.be.empty @xcconfig.to_hash['HEADER_SEARCH_PATHS'].should.be.nil
end end
it 'adds the COCOAPODS macro definition' do it 'adds the COCOAPODS macro definition' do
......
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