cocoapods 1.2.0.rc.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 706845641668166c76b602959fd9a7b6e6cce4f5
-  data.tar.gz: 40632ff91358ea162518f6e69ffd31a48cb0ef36
+  metadata.gz: 2a57f79fc629b5289f1f038308f9c172f58b3f5b
+  data.tar.gz: abfa6799ad8f9141f65e606dfd4ef57a383c936e
 SHA512:
-  metadata.gz: d55f7ebc3eef9668cd4c949bf5f0a58871188aa9c8b439b58595b194bc52e34a1c3b5d1f45a83ceab5e4a6603ee23602031ab9dac286947cf97ac68a2d0212ed
-  data.tar.gz: abe513b8f86453f0c7cbe82274c7a61082709c4e454bb7524ca498509c3051ed05227a1bd86408b0beaa456f6104eaadd594d4f00ae82b6d2023cbcce99f7701
+  metadata.gz: a32e2f6f5ed591e2ad2538ecf5394c283d4d5baec0e7efc0a5705b8df4ed7f2a301150aeb872b1f714f42fe093c657c8f85075aff6eb1415d41c8217bc37c9b4
+  data.tar.gz: 9999bca177dead3fc01db2f130f8e41eba93c4a97dd91d90408e5337ca672a7cedf0d6c4d401ecf68b4afe78617db43ef8becb2632f7ff17fc507912438d45bb

data/CHANGELOG.md

@@ -4,6 +4,19 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.2.0 (2017-01-28)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Do not link static frameworks to targets that use `inherit! search_paths`.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6065](https://github.com/CocoaPods/CocoaPods/issues/6065)
+
+
 ## 1.2.0.rc.1 (2017-01-13)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.2.0.rc.1'.freeze unless defined? Pod::VERSION
+  VERSION = '1.2.0'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -185,7 +185,7 @@ module Pod
 
           targets.each do |pod_target|
             unless pod_target.should_build? && pod_target.requires_frameworks?
-              XCConfigHelper.add_settings_for_file_accessors_of_target(pod_target, @xcconfig)
+              XCConfigHelper.add_settings_for_file_accessors_of_target(target, pod_target, @xcconfig)
             end
           end
         end

data/lib/cocoapods/generator/xcconfig/pod_xcconfig.rb

@@ -59,7 +59,7 @@ module Pod
 
           @xcconfig = Xcodeproj::Config.new(config)
 
-          XCConfigHelper.add_settings_for_file_accessors_of_target(target, @xcconfig)
+          XCConfigHelper.add_settings_for_file_accessors_of_target(nil, target, @xcconfig)
           target.file_accessors.each do |file_accessor|
             @xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig)
           end

data/lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -61,7 +61,10 @@ module Pod
 
         # Configures the given Xcconfig
         #
-        # @param  [PodTarget] target
+        # @param  [AggregateTarget] aggregate_target
+        #         The aggregate target, may be nil.
+        #
+        # @param  [PodTarget] pod_target
         #         The pod target, which holds the list of +Spec::FileAccessor+.
         #
         # @param  [Xcodeproj::Config] xcconfig
@@ -69,14 +72,14 @@ module Pod
         #
         # @return [void]
         #
-        def self.add_settings_for_file_accessors_of_target(target, xcconfig)
-          target.file_accessors.each do |file_accessor|
+        def self.add_settings_for_file_accessors_of_target(aggregate_target, pod_target, xcconfig)
+          pod_target.file_accessors.each do |file_accessor|
             XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, xcconfig)
-            XCConfigHelper.add_static_dependency_build_settings(target, xcconfig, file_accessor)
+            XCConfigHelper.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, file_accessor)
           end
-          XCConfigHelper.add_dynamic_dependency_build_settings(target, xcconfig)
-          if target.requires_frameworks?
-            target.dependent_targets.each do |dependent_target|
+          XCConfigHelper.add_dynamic_dependency_build_settings(pod_target, xcconfig)
+          if pod_target.requires_frameworks?
+            pod_target.dependent_targets.each do |dependent_target|
               XCConfigHelper.add_dynamic_dependency_build_settings(dependent_target, xcconfig)
             end
           end
@@ -84,7 +87,10 @@ module Pod
 
         # Adds build settings for static vendored frameworks and libraries.
         #
-        # @param [PodTarget] target
+        # @param  [AggregateTarget] aggregate_target
+        #         The aggregate target, may be nil.
+        #
+        # @param [PodTarget] pod_target
         #        The pod target, which holds the list of +Spec::FileAccessor+.
         #
         # @param [Xcodeproj::Config] xcconfig
@@ -95,18 +101,20 @@ module Pod
         #
         # @return [void]
         #
-        def self.add_static_dependency_build_settings(target, xcconfig, file_accessor)
+        def self.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, file_accessor)
           file_accessor.vendored_static_frameworks.each do |vendored_static_framework|
-            XCConfigHelper.add_framework_build_settings(vendored_static_framework, xcconfig, target.sandbox.root)
+            if aggregate_target.nil? || aggregate_target.target_definition.inheritance != 'search_paths'
+              XCConfigHelper.add_framework_build_settings(vendored_static_framework, xcconfig, pod_target.sandbox.root)
+            end
           end
           file_accessor.vendored_static_libraries.each do |vendored_static_library|
-            XCConfigHelper.add_library_build_settings(vendored_static_library, xcconfig, target.sandbox.root)
+            XCConfigHelper.add_library_build_settings(vendored_static_library, xcconfig, pod_target.sandbox.root)
           end
         end
 
         # Adds build settings for dynamic vendored frameworks and libraries.
         #
-        # @param [PodTarget] target
+        # @param [PodTarget] pod_target
         #        The pod target, which holds the list of +Spec::FileAccessor+.
         #
         # @param [Xcodeproj::Config] xcconfig
@@ -114,13 +122,13 @@ module Pod
         #
         # @return [void]
         #
-        def self.add_dynamic_dependency_build_settings(target, xcconfig)
-          target.file_accessors.each do |file_accessor|
+        def self.add_dynamic_dependency_build_settings(pod_target, xcconfig)
+          pod_target.file_accessors.each do |file_accessor|
             file_accessor.vendored_dynamic_frameworks.each do |vendored_dynamic_framework|
-              XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, target.sandbox.root)
+              XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, pod_target.sandbox.root)
             end
             file_accessor.vendored_dynamic_libraries.each do |vendored_dynamic_library|
-              XCConfigHelper.add_library_build_settings(vendored_dynamic_library, xcconfig, target.sandbox.root)
+              XCConfigHelper.add_library_build_settings(vendored_dynamic_library, xcconfig, pod_target.sandbox.root)
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement