Commit 4524ffef authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #2886 from CocoaPods/seg-no-integrate-default-configurations

[Analyzer] Change no-integrate default build configurations to not be empty
parents a46f739d d35a66bc
...@@ -27,6 +27,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -27,6 +27,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Samuel Giddins](https://github.com/segiddins) [Samuel Giddins](https://github.com/segiddins)
[#2879](https://github.com/CocoaPods/CocoaPods/issues/2879) [#2879](https://github.com/CocoaPods/CocoaPods/issues/2879)
* Restore the `#define`s in the environment header when the `--no-integrate`
installation option is used.
[Samuel Giddins](https://github.com/segiddins)
[#2876](https://github.com/CocoaPods/CocoaPods/issues/2876)
## 0.35.0 ## 0.35.0
......
...@@ -196,7 +196,7 @@ module Pod ...@@ -196,7 +196,7 @@ module Pod
else else
target.client_root = config.installation_root target.client_root = config.installation_root
target.user_target_uuids = [] target.user_target_uuids = []
target.user_build_configurations = target_definition.build_configurations || {} target.user_build_configurations = target_definition.build_configurations || { 'Release' => :release, 'Debug' => :debug }
if target_definition.platform.name == :osx if target_definition.platform.name == :osx
target.archs = '$(ARCHS_STANDARD_64_BIT)' target.archs = '$(ARCHS_STANDARD_64_BIT)'
end end
......
...@@ -104,7 +104,7 @@ module Pod ...@@ -104,7 +104,7 @@ module Pod
target.client_root.should == config.installation_root target.client_root.should == config.installation_root
target.user_target_uuids.should == [] target.user_target_uuids.should == []
target.user_build_configurations.should == {} target.user_build_configurations.should == { 'Release' => :release, 'Debug' => :debug }
target.platform.to_s.should == 'iOS 6.0' target.platform.to_s.should == 'iOS 6.0'
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