Commit 691e3de4 authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #4217 from CocoaPods/fix-archiving

Clear out PRIVATE/PUBLIC_HEADERS_FOLDER_PATH
parents d5261242 8d2ea653
......@@ -60,6 +60,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Samuel Giddins](https://github.com/segiddins)
[#4083](https://github.com/CocoaPods/CocoaPods/issues/4083)
* The headers folders paths for static library pods will be unset, fixing
validation when archives are uploaded to iTunes Connect.
[Boris Bügling](https://github.com/neonichu)
[Samuel Giddins](https://github.com/segiddins)
[#4119](https://github.com/CocoaPods/CocoaPods/issues/4119)
## 0.39.0.beta.4 (2015-09-02)
......
......@@ -36,6 +36,20 @@ module Pod
private
# Remove the default headers folder path settings for static library pod
# targets.
#
# @return [Hash{String => String}]
#
def custom_build_settings
settings = super
unless target.requires_frameworks?
settings['PRIVATE_HEADERS_FOLDER_PATH'] = ''
settings['PUBLIC_HEADERS_FOLDER_PATH'] = ''
end
settings
end
#-----------------------------------------------------------------------#
SOURCE_FILE_EXTENSIONS = Sandbox::FileAccessor::SOURCE_FILE_EXTENSIONS
......
Subproject commit 8732aa416f7729d06df8ae4ea838837f37a0db9f
Subproject commit ad51467cca929004a7e5bff2caf29c61ee351e3c
......@@ -71,6 +71,27 @@ module Pod
#--------------------------------------#
describe 'headers folder paths' do
it 'does not set them for framework targets' do
@pod_target.stubs(:requires_frameworks? => true)
@installer.install!
@project.targets.first.build_configurations.each do |config|
config.build_settings['PUBLIC_HEADERS_FOLDER_PATH'].should.be.nil
config.build_settings['PRIVATE_HEADERS_FOLDER_PATH'].should.be.nil
end
end
it 'empties them for non-framework targets' do
@installer.install!
@project.targets.first.build_configurations.each do |config|
config.build_settings['PUBLIC_HEADERS_FOLDER_PATH'].should.be.empty
config.build_settings['PRIVATE_HEADERS_FOLDER_PATH'].should.be.empty
end
end
end
#--------------------------------------#
it 'adds the source files of each pod to the target of the Pod library' do
@installer.install!
names = @installer.target.native_target.source_build_phase.files.map { |bf| bf.file_ref.display_name }
......
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