Merge branch 'master' into dedicated-targets

* master: Release 0.19.1 [Integration] Update version in fixtures CHANGELOG [skip ci] [TargetInstaller] Create unique hash instances for the build settings [Generator::Xcconfig] Add inherited to GCC_PREPROCESSOR_DEFINITIONS Changelog [ci skip] Conflicts: lib/cocoapods/generator/xcconfig.rb

Merge branch 'master' into dedicated-targets
* master: Release 0.19.1 [Integration] Update version in fixtures CHANGELOG [skip ci] [TargetInstaller] Create unique hash instances for the build settings [Generator::Xcconfig] Add inherited to GCC_PREPROCESSOR_DEFINITIONS Changelog [ci skip] Conflicts: lib/cocoapods/generator/xcconfig.rb
c9235c6d · Fabio Pelosin · 397eaa9a · 11dca2a8 · c9235c6d · c9235c6d
Commit c9235c6d authored Apr 30, 2013 by Fabio Pelosin
46 changed files
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+## Installation & Update
+To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
+## Master
+## 0.19.1
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.19.0...0.19.1)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.19.0...0.19.1)
+###### Bug fixes
+* Project-level preprocessor macros are not overwritten anymore.
+  [#903](https://github.com/CocoaPods/CocoaPods/issues/903)
+* A Unique hash instances for the build settings of the Pods target is now
+  created resolving interferences in the hooks.
+  [#1014](https://github.com/CocoaPods/CocoaPods/issues/1014)
 ## 0.19.0
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.18.1...0.19.0)
 • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.18.1...0.19.0)
@@ -16,7 +34,7 @@
  [#556](https://github.com/CocoaPods/CocoaPods/issues/556)
 * Added `pod podfile-info` command. Shows list of used Pods and their info
  in a project or supplied Podfile.
-  Options: `--all` - with dependancies. `--md` - in Markdown.
+  Options: `--all` - with dependencies. `--md` - in Markdown.
  [#855](https://github.com/CocoaPods/CocoaPods/issues/855)
 * Added `pod help` command. You can still use the old format
  with --help flag.

--- a/lib/cocoapods/gem_version.rb
+++ b/lib/cocoapods/gem_version.rb
@@ -2,6 +2,6 @@ module Pod
  # The version of the cocoapods command line tool.
  #
-  VERSION = '0.19.0' unless defined? Pod::VERSION
+  VERSION = '0.19.1' unless defined? Pod::VERSION
 end
--- a/lib/cocoapods/generator/xcconfig.rb
+++ b/lib/cocoapods/generator/xcconfig.rb
@@ -66,7 +66,7 @@ module Pod
          'PODS_HEADERS_SEARCH_PATHS'        => '${PODS_PUBLIC_HEADERS_SEARCH_PATHS}',
          'PODS_BUILD_HEADERS_SEARCH_PATHS'  => quote(library.build_headers.search_paths),
          'PODS_PUBLIC_HEADERS_SEARCH_PATHS' => quote(public_headers),
-          'GCC_PREPROCESSOR_DEFINITIONS'     => 'COCOAPODS=1'
+          'GCC_PREPROCESSOR_DEFINITIONS'     => '$(inherited) COCOAPODS=1'
        })
        spec_consumers.each do |consumer|

--- a/lib/cocoapods/installer/target_installer.rb
+++ b/lib/cocoapods/installer/target_installer.rb
@@ -80,7 +80,7 @@ module Pod
          unless @target.build_configurations.map(&:name).include?(bc_name)
            build_config = project.new(Xcodeproj::Project::XCBuildConfiguration)
            build_config.name = bc_name
-            settings = @target.build_settings(type.to_s.capitalize)
+            settings = @target.build_settings(type.to_s.capitalize).dup
            build_config.build_settings = settings
            target.build_configurations << build_config
          end

--- a/spec/integration/install_add_pod/after/Podfile.lock
+++ b/spec/integration/install_add_pod/after/Podfile.lock
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
  JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_add_pod/after/Pods/Manifest.lock
+++ b/spec/integration/install_add_pod/after/Pods/Manifest.lock
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
  JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_add_pod/after/Pods/Pods.xcconfig
+++ b/spec/integration/install_add_pod/after/Pods/Pods.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_custom_workspace/after/Podfile.lock
+++ b/spec/integration/install_custom_workspace/after/Podfile.lock
@@ -8,4 +8,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_custom_workspace/after/Pods/Manifest.lock
+++ b/spec/integration/install_custom_workspace/after/Pods/Manifest.lock
@@ -8,4 +8,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1.xcconfig
+++ b/spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2.xcconfig
+++ b/spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_external_source/after/Podfile.lock
+++ b/spec/integration/install_external_source/after/Podfile.lock
@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_external_source/after/Pods/Manifest.lock
+++ b/spec/integration/install_external_source/after/Pods/Manifest.lock
@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_external_source/after/Pods/Pods.xcconfig
+++ b/spec/integration/install_external_source/after/Pods/Pods.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"

--- a/spec/integration/install_local_source/after/Podfile.lock
+++ b/spec/integration/install_local_source/after/Podfile.lock
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_local_source/after/Pods/Manifest.lock
+++ b/spec/integration/install_local_source/after/Pods/Manifest.lock
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_local_source/after/Pods/Pods.xcconfig
+++ b/spec/integration/install_local_source/after/Pods/Pods.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_multiple_targets/after/Podfile.lock
+++ b/spec/integration/install_multiple_targets/after/Podfile.lock
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
  JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_multiple_targets/after/Pods/Manifest.lock
+++ b/spec/integration/install_multiple_targets/after/Pods/Manifest.lock
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
  JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2.xcconfig
+++ b/spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_multiple_targets/after/Pods/Pods-test.xcconfig
+++ b/spec/integration/install_multiple_targets/after/Pods/Pods-test.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_multiple_targets/after/Pods/Pods.xcconfig
+++ b/spec/integration/install_multiple_targets/after/Pods/Pods.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_new/after/Podfile.lock
+++ b/spec/integration/install_new/after/Podfile.lock
@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_new/after/Pods/Manifest.lock
+++ b/spec/integration/install_new/after/Pods/Manifest.lock
@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_new/after/Pods/Pods.xcconfig
+++ b/spec/integration/install_new/after/Pods/Pods.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_podfile_callbacks/after/Podfile.lock
+++ b/spec/integration/install_podfile_callbacks/after/Podfile.lock
@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_podfile_callbacks/after/Pods/Manifest.lock
+++ b/spec/integration/install_podfile_callbacks/after/Pods/Manifest.lock
@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_podfile_callbacks/after/Pods/Pods.xcconfig
+++ b/spec/integration/install_podfile_callbacks/after/Pods/Pods.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_podspec/after/Podfile.lock
+++ b/spec/integration/install_podspec/after/Podfile.lock
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_podspec/after/Pods/Manifest.lock
+++ b/spec/integration/install_podspec/after/Pods/Manifest.lock
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_podspec/after/Pods/Pods.xcconfig
+++ b/spec/integration/install_podspec/after/Pods/Pods.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_remove_pod/after/Podfile.lock
+++ b/spec/integration/install_remove_pod/after/Podfile.lock
@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_remove_pod/after/Pods/Manifest.lock
+++ b/spec/integration/install_remove_pod/after/Pods/Manifest.lock
@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_remove_pod/after/Pods/Pods.xcconfig
+++ b/spec/integration/install_remove_pod/after/Pods/Pods.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_spec_callbacks/after/Podfile.lock
+++ b/spec/integration/install_spec_callbacks/after/Podfile.lock
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  Reachability: c1e48cc25f8e7cba878c83ad1981d334ef325522
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_spec_callbacks/after/Pods/Manifest.lock
+++ b/spec/integration/install_spec_callbacks/after/Pods/Manifest.lock
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  Reachability: c1e48cc25f8e7cba878c83ad1981d334ef325522
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_spec_callbacks/after/Pods/Pods.xcconfig
+++ b/spec/integration/install_spec_callbacks/after/Pods/Pods.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/integration/install_subspecs/after/Podfile.lock
+++ b/spec/integration/install_subspecs/after/Podfile.lock
@@ -13,4 +13,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_subspecs/after/Pods/Manifest.lock
+++ b/spec/integration/install_subspecs/after/Pods/Manifest.lock
@@ -13,4 +13,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/install_subspecs/after/Pods/Pods-OS X App.xcconfig
+++ b/spec/integration/install_subspecs/after/Pods/Pods-OS X App.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"

--- a/spec/integration/install_subspecs/after/Pods/Pods-iOS App.xcconfig
+++ b/spec/integration/install_subspecs/after/Pods/Pods-iOS App.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"

--- a/spec/integration/update/after/Podfile.lock
+++ b/spec/integration/update/after/Podfile.lock
@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/update/after/Pods/Manifest.lock
+++ b/spec/integration/update/after/Pods/Manifest.lock
@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
  Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.19.0
+COCOAPODS: 0.19.1
--- a/spec/integration/update/after/Pods/Pods.xcconfig
+++ b/spec/integration/update/after/Pods/Pods.xcconfig
 ALWAYS_SEARCH_USER_PATHS = YES
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
 OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"

--- a/spec/unit/generator/xcconfig_spec.rb
+++ b/spec/unit/generator/xcconfig_spec.rb
@@ -76,7 +76,7 @@ module Pod
    end
    it 'adds the COCOAPODS macro definition' do
-      @xcconfig.to_hash['GCC_PREPROCESSOR_DEFINITIONS'].should == 'COCOAPODS=1'
+      @xcconfig.to_hash['GCC_PREPROCESSOR_DEFINITIONS'].should == '$(inherited) COCOAPODS=1'
    end
    it "includes the xcconfig of the specifications" do

--- a/spec/unit/installer/target_installer_spec.rb
+++ b/spec/unit/installer/target_installer_spec.rb
@@ -105,7 +105,7 @@ module Pod
      it "adds the settings of the xcconfig that need to be overridden to the target" do
        @installer.install!
        build_configuration = @project.targets.first.build_configurations
-        build_settings      = build_configuration.first.build_settings
+        build_settings = build_configuration.first.build_settings
        Generator::XCConfig.pods_project_settings.each do |key, value|
          build_settings[key].should == value
        end
@@ -116,6 +116,12 @@ module Pod
        @project.targets.first.build_configurations.map(&:name).sort.should == %w{ AppStore Debug Release Test }
      end
+      it "it creates different hash instances for the build settings of various build configurations" do
+        @installer.install!
+        build_settings = @project.targets.first.build_configurations.map(&:build_settings)
+        build_settings.map(&:object_id).uniq.count.should == 4
+      end
      it "does not enable the GCC_WARN_INHIBIT_ALL_WARNINGS flag by default" do
        @installer.install!
        @installer.library.target.build_configurations.each do |config|