cocoapods 1.7.0.rc.1 → 1.7.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 643fc24912e72d9f38aaf90853b155a6b5468d5a370e1f97fb31e89b248f200a
-  data.tar.gz: daee7ef9f7178e551ef6e585a7524752c26436e8f70cc98c2ba997786d67cc80
+SHA1:
+  metadata.gz: fa00a44e0b53a2cb25e62b107e82a9a9b3d50943
+  data.tar.gz: 0aaff85a1def4fac9642fdc149ac66e4e1e5bd6a
 SHA512:
-  metadata.gz: 6830b2ef5e87f413426ec1b78cb87b182883c1e910173d9d630a6541f4d00d89e32c5a24ac0dc11ac5fdc63b8a50b7bd8cb8c15dd4bb86d2a671edc3a716995a
-  data.tar.gz: 6684ac7cf04ade56943495ed8f8b860b23340d572275768985b0aa2eca7ad877352bd334ed93981080eb2bf8b9f0ff45ef787af2581b3fd29f96f05d2b4546e2
+  metadata.gz: 8d3508da82c5cfbf880d92247e743c88dc17d06b5b7de9a58fca775bb96101a9eb09efc283beaec517569566bf1504c37f23697765602c3c69ed2beee618fd94
+  data.tar.gz: a1a51889d4ef2fddb117c62c60f8ba2392969d3491a3555992d55e1a54b2d5a60cd4416b9bf22fc25dae14da8a8d42a12b524368adaafb08daf19f950ac5d0bb

data/CHANGELOG.md

@@ -4,6 +4,31 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.7.0.rc.2 (2019-05-15)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Don't add resources to a second test_spec pod target build phase  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#8173](https://github.com/CocoaPods/CocoaPods/issues/8173)
+
+* Fix 1.7.0.rc.1 static library regression for pods with `header_dir` attribute  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#8765](https://github.com/CocoaPods/CocoaPods/issues/8765)
+
+* Scope app spec dependent targets when no dedup'ing targets.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8770](https://github.com/CocoaPods/CocoaPods/pull/8770)
+
+* Fix embedding static frameworks in extensions while using `use_frameworks!`  
+  [Martin Fiebig](https://github.com/mfiebig)
+  [#8798](https://github.com/CocoaPods/CocoaPods/pull/8798)
+
+
 ## 1.7.0.rc.1 (2019-05-02)
 
 ##### Enhancements
@@ -38,6 +63,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Itay Brenner](https://github.com/itaybre)
   [#8648](https://github.com/CocoaPods/CocoaPods/issues/8648)
 
+
 ## 1.7.0.beta.3 (2019-03-28)
 
 ##### Enhancements
@@ -213,6 +239,19 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [#8521](https://github.com/CocoaPods/CocoaPods/pull/8521)
 
 
+## 1.6.2 (2019-05-15)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Ensure all embedded pod targets are copied over to the host target.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8608](https://github.com/CocoaPods/CocoaPods/issues/8608)
+
+
 ## 1.6.1 (2019-02-21)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/installer/analyzer.rb

@@ -303,11 +303,12 @@ module Pod
             pod_target_names = Set.new(aggregate_target.pod_targets_for_build_configuration(configuration_name).map(&:name))
             embedded_pod_targets = embedded_aggregate_target.pod_targets_for_build_configuration(configuration_name).select do |pod_target|
               if !pod_target_names.include?(pod_target.name) &&
-                 aggregate_target.pod_targets.none? { |aggregate_pod_target| (pod_target.specs - aggregate_pod_target.specs).empty? }
+                 aggregate_target.pod_targets.none? { |aggregate_pod_target| (pod_target.specs - aggregate_pod_target.specs).empty? } &&
+                 (libraries_only || pod_target.build_as_dynamic?)
                 pod_target.name
               end
             end
-            embedded_pod_targets_by_build_config[configuration_name] = embedded_pod_targets
+            embedded_pod_targets_by_build_config[configuration_name] += embedded_pod_targets
           end
         end
         embedded_pod_targets_by_build_config

data/lib/cocoapods/target/pod_target.rb

@@ -117,15 +117,18 @@ module Pod
         if cache[cache_key]
           cache[cache_key]
         else
-          target = PodTarget.new(sandbox, host_requires_frameworks, user_build_configurations, archs, platform, specs, [target_definition], file_accessors, target_definition.label,
-                                 :build_type => build_type)
-          target.dependent_targets = dependent_targets.flat_map { |pt| pt.scoped(cache) }.select { |pt| pt.target_definitions == [target_definition] }
-          target.test_dependent_targets_by_spec_name = Hash[test_dependent_targets_by_spec_name.map do |spec_name, test_pod_targets|
-            scoped_test_pod_targets = test_pod_targets.flat_map do |test_pod_target|
-              test_pod_target.scoped(cache).select { |pt| pt.target_definitions == [target_definition] }
-            end
-            [spec_name, scoped_test_pod_targets]
-          end]
+          target_definitions = [target_definition]
+          target = PodTarget.new(sandbox, host_requires_frameworks, user_build_configurations, archs, platform, specs,
+                                 [target_definition], file_accessors, target_definition.label, :build_type => build_type)
+          target.dependent_targets = dependent_targets.flat_map { |pt| pt.scoped(cache) }.select do |pt|
+            pt.target_definitions == target_definitions
+          end
+          target.test_dependent_targets_by_spec_name = scope_dependent_pod_targets(cache,
+                                                                                   test_dependent_targets_by_spec_name,
+                                                                                   target_definitions)
+          target.app_dependent_targets_by_spec_name = scope_dependent_pod_targets(cache,
+                                                                                  app_dependent_targets_by_spec_name,
+                                                                                  target_definitions)
           cache[cache_key] = target
         end
       end
@@ -150,7 +153,11 @@ module Pod
     # @return [Pathname] the pathname for headers in the sandbox.
     #
     def headers_sandbox
-      Pathname.new(product_module_name)
+      if root_spec.consumer(platform).header_dir
+        Pathname.new(pod_name)
+      else
+        Pathname.new(product_module_name)
+      end
     end
 
     # @return [Hash{FileAccessor => Hash}] Hash of file accessors by header mappings.
@@ -363,13 +370,14 @@ module Pod
     end
 
     # @return [Hash{String=>Array<String>}] The resource and resource bundle paths this target depends upon keyed by
-    #         spec name.
+    #         spec name. Resources for app specs and test specs are directly added to “Copy Bundle Resources” phase
+    #         from the generated targets therefore they are not part of the resource paths.
     #
     def resource_paths
       @resource_paths ||= begin
         file_accessors.each_with_object({}) do |file_accessor, hash|
           resource_paths = file_accessor.resources.map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project_path.dirname)}" }
-          resource_paths = [] if file_accessor.spec.app_specification?
+          resource_paths = [] if file_accessor.spec.non_library_specification?
           prefix = Pod::Target::BuildSettings::CONFIGURATION_BUILD_DIR_VARIABLE
           prefix = configuration_build_dir unless file_accessor.spec.test_specification?
           resource_bundle_paths = file_accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
@@ -760,6 +768,15 @@ module Pod
 
     private
 
+    def scope_dependent_pod_targets(cache, dependent_targets, target_definitions)
+      Hash[dependent_targets.map do |spec_name, pod_targets|
+        scoped_pod_targets = pod_targets.flat_map do |pod_target|
+          pod_target.scoped(cache).select { |pt| pt.target_definitions == target_definitions }
+        end
+        [spec_name, scoped_pod_targets]
+      end]
+    end
+
     def create_build_settings
       BuildSettings::PodTargetSettings.new(self)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.7.0.rc.1
+  version: 1.7.0.rc.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-05-15 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.7.0.rc.1
+        version: 1.7.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.rc.1
+        version: 1.7.0.rc.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -557,7 +557,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.