Commit 320548b7 authored by Samuel E. Giddins's avatar Samuel E. Giddins

[XCConfigIntegrator] Update descriptions to be more verbose

Thanks @alloy!
parent b8320501
...@@ -78,10 +78,12 @@ module Pod ...@@ -78,10 +78,12 @@ module Pod
group = config.project['Pods'] || config.project.new_group('Pods') group = config.project['Pods'] || config.project.new_group('Pods')
file_ref = group.files.find { |f| f.path == path } file_ref = group.files.find { |f| f.path == path }
if config.base_configuration_reference != file_ref if config.base_configuration_reference != file_ref
UI.warn "CocoaPods did not set the base configuration of your " \ UI.warn 'CocoaPods did not set the base configuration of your ' \
"project because one is already set. Please either set the " \ 'project because because your project already has a custom ' \
"base configurations of the target `#{target.name}` to " \ 'config set. In order for CocoaPods integration to work at ' \
"`#{path}` or include the `#{path}` in your build configuration." 'all, please either set the base configurations of the target ' \
"#{target.name}` to `#{path}` or include the `#{path}` in your " \
'build configuration.'
else else
file_ref ||= group.new_file(path) file_ref ||= group.new_file(path)
config.base_configuration_reference = file_ref config.base_configuration_reference = file_ref
......
...@@ -48,8 +48,8 @@ module Pod ...@@ -48,8 +48,8 @@ module Pod
config.base_configuration_reference.should.equal existing config.base_configuration_reference.should.equal existing
end end
it 'does not set the Pods xcconfig as the base config if the base ' \ it 'does not set the Pods xcconfig as the base config if the user ' \
'config is already set' do 'has already set a config of their own' do
sample_config = @project.new_file('SampleConfig.xcconfig') sample_config = @project.new_file('SampleConfig.xcconfig')
@target.build_configurations.each do |config| @target.build_configurations.each do |config|
config.base_configuration_reference = sample_config config.base_configuration_reference = sample_config
......
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