Commit c5907978 authored by Eloy Durán's avatar Eloy Durán

[UserProjectIntegrator] Config values are returned as arrays.

Fix for 52c2f915.
parent 359e0aa9
...@@ -144,7 +144,7 @@ module Pod ...@@ -144,7 +144,7 @@ module Pod
if xcconfig if xcconfig
xcconfig.to_hash.keys.each do |key| xcconfig.to_hash.keys.each do |key|
target_value = config.build_settings[key] target_value = config.build_settings[key]
if target_value && target_value !~ /\$[({]inherited[})]/ if target_value && target_value.grep(/\$[({]inherited[})]/).empty?
print_override_warning(aggregate_target, user_target, config, key) print_override_warning(aggregate_target, user_target, config, key)
end end
end end
......
...@@ -57,7 +57,7 @@ module Pod ...@@ -57,7 +57,7 @@ module Pod
it 'check that the integrated target does not override the CocoaPods build settings' do it 'check that the integrated target does not override the CocoaPods build settings' do
UI.warnings = '' UI.warnings = ''
target_config = stub(:name => 'Release', :build_settings => { 'GCC_PREPROCESSOR_DEFINITIONS' => 'FLAG=1' }) target_config = stub(:name => 'Release', :build_settings => { 'GCC_PREPROCESSOR_DEFINITIONS' => ['FLAG=1'] })
user_target = stub(:name => 'SampleProject', :build_configurations => [target_config]) user_target = stub(:name => 'SampleProject', :build_configurations => [target_config])
@library.stubs(:user_targets).returns([user_target]) @library.stubs(:user_targets).returns([user_target])
...@@ -72,7 +72,7 @@ module Pod ...@@ -72,7 +72,7 @@ module Pod
it 'allows the use of the alternate form of the inherited flag' do it 'allows the use of the alternate form of the inherited flag' do
UI.warnings = '' UI.warnings = ''
target_config = stub(:name => 'Release', :build_settings => { 'GCC_PREPROCESSOR_DEFINITIONS' => 'FLAG=1 ${inherited}' }) target_config = stub(:name => 'Release', :build_settings => { 'GCC_PREPROCESSOR_DEFINITIONS' => ['FLAG=1', '${inherited}'] })
user_target = stub(:name => 'SampleProject', :build_configurations => [target_config]) user_target = stub(:name => 'SampleProject', :build_configurations => [target_config])
@library.stubs(:user_targets).returns([user_target]) @library.stubs(:user_targets).returns([user_target])
...@@ -86,7 +86,7 @@ module Pod ...@@ -86,7 +86,7 @@ module Pod
it 'allows build settings which inherit the settings form the CocoaPods xcconfig' do it 'allows build settings which inherit the settings form the CocoaPods xcconfig' do
UI.warnings = '' UI.warnings = ''
target_config = stub(:name => 'Release', :build_settings => { 'GCC_PREPROCESSOR_DEFINITIONS' => 'FLAG=1 $(inherited)' }) target_config = stub(:name => 'Release', :build_settings => { 'GCC_PREPROCESSOR_DEFINITIONS' => ['FLAG=1', '$(inherited)'] })
user_target = stub(:name => 'SampleProject', :build_configurations => [target_config]) user_target = stub(:name => 'SampleProject', :build_configurations => [target_config])
@library.stubs(:user_targets).returns([user_target]) @library.stubs(:user_targets).returns([user_target])
......
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