Commit ac3c7dfe authored by Danielle Tomlinson's avatar Danielle Tomlinson Committed by GitHub

Merge pull request #6969 from paulb777/static-framework-private-headers

Add Private Header support to static frameworks
parents 61afb0d9 66f46c30
...@@ -16,6 +16,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -16,6 +16,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Paul Beusterien](https://github.com/paulb777) [Paul Beusterien](https://github.com/paulb777)
[#6811](https://github.com/CocoaPods/CocoaPods/pull/6811) [#6811](https://github.com/CocoaPods/CocoaPods/pull/6811)
* Add Private Header support to static frameworks
[paulb777](https://github.com/paulb777)
[#6969](https://github.com/CocoaPods/CocoaPods/issues/6969)
##### Bug Fixes ##### Bug Fixes
* Wrap platform warning message with quotes * Wrap platform warning message with quotes
......
...@@ -85,6 +85,7 @@ module Pod ...@@ -85,6 +85,7 @@ module Pod
settings['PRODUCT_NAME'] = framework_name settings['PRODUCT_NAME'] = framework_name
if target.static_framework? if target.static_framework?
settings['PUBLIC_HEADERS_FOLDER_PATH'] = framework_name + '.framework' + '/Headers' settings['PUBLIC_HEADERS_FOLDER_PATH'] = framework_name + '.framework' + '/Headers'
settings['PRIVATE_HEADERS_FOLDER_PATH'] = framework_name + '.framework' + '/PrivateHeaders'
end end
else else
settings.merge!('OTHER_LDFLAGS' => '', 'OTHER_LIBTOOLFLAGS' => '') settings.merge!('OTHER_LDFLAGS' => '', 'OTHER_LIBTOOLFLAGS' => '')
......
...@@ -72,6 +72,18 @@ module Pod ...@@ -72,6 +72,18 @@ module Pod
'AppStore' => 'BananaLib.framework/Headers', 'AppStore' => 'BananaLib.framework/Headers',
} }
end end
it 'verify private header path for a static library framework' do
@pod_target.stubs(:requires_frameworks?).returns(true)
@pod_target.stubs(:static_framework?).returns(true)
@installer.send(:add_target)
@installer.send(:native_target).resolved_build_setting('PRIVATE_HEADERS_FOLDER_PATH').should == {
'Release' => 'BananaLib.framework/PrivateHeaders',
'Debug' => 'BananaLib.framework/PrivateHeaders',
'Test' => 'BananaLib.framework/PrivateHeaders',
'AppStore' => 'BananaLib.framework/PrivateHeaders',
}
end
end end
end end
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