cocoapods 0.39.0.beta.5 → 0.39.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d34fbbd05497ec88b132304db391872b725f0976
-  data.tar.gz: 07097a4bea5c3ddfcf65fc77de8ec0968ef8aa31
+  metadata.gz: b9b6307f3481f68a070b2041113029c82645970c
+  data.tar.gz: e2930c2cd0e469383e9f12957ea91d3e577e02ba
 SHA512:
-  metadata.gz: e749c9394f1dc06fc4e06bb64b1e9b9d6602d9381f23a450cf8688c8a834f167a8c3b45b6a41c85e964de30db7d3614a7f3e27a4125608c9fcaa8b96d3638a56
-  data.tar.gz: 1aaca2db33e7209f5cd93aeb44159f3fd85351aa807f2e9bd0edb6e5a1c4749ac2979f4a7fe21787398e3fe1b62a39754342d202e10f0197aa18b0d457c2ccfd
+  metadata.gz: d2f291a5925c5f21e2798eec82e84f90ba152b4cfdf464bd47e76dbfc1e111dd32ddf6b934b2ba9f7458f6775f61e2933a4c72af14986f74512158e9f15be846
+  data.tar.gz: 8cd1087485caa43c0ea13619e73f28f79f925ee92767797c3622380ec724e746223057632484020b6bede6b089fe1eb4b59f79ff29ea80816bea92f5f612c711

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`
 
+## 0.39.0.rc.1 (2015-10-05)
+
+##### Enhancements
+
+* Support for adding dependency target vendored libraries and frameworks to build settings.  
+  [Kevin Coleman](https://github.com/kcoleman731)
+  [#4278](https://github.com/CocoaPods/CocoaPods/pull/4278)
+
+* Always link the aggregate target as static to the user project.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#4137](https://github.com/CocoaPods/CocoaPods/pull/4137)
+
+
 ## 0.39.0.beta.5 (2015-10-01)
 
 ##### Breaking

data/lib/cocoapods/gem_version.rb

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

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

@@ -43,7 +43,6 @@ module Pod
           target_search_paths = target.build_headers.search_paths(target.platform)
           sandbox_search_paths = target.sandbox.public_headers.search_paths(target.platform)
           search_paths = target_search_paths.concat(sandbox_search_paths).uniq
-          framework_search_paths = target.dependent_targets.flat_map(&:file_accessors).flat_map(&:vendored_frameworks).map { |fw| '${PODS_ROOT}/' << fw.dirname.relative_path_from(target.sandbox.root).to_s }
 
           config = {
             'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
@@ -51,7 +50,7 @@ module Pod
             'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths),
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
             'SKIP_INSTALL' => 'YES',
-            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ' << XCConfigHelper.quote(framework_search_paths)
+            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) '
             # 'USE_HEADERMAP' => 'NO'
           }
 

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

@@ -52,6 +52,26 @@ module Pod
         def self.add_settings_for_file_accessors_of_target(target, xcconfig)
           target.file_accessors.each do |file_accessor|
             XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, xcconfig)
+          end
+          XCConfigHelper.add_vendored_dependency_build_settings(target, xcconfig)
+        end
+
+        # Adds build settings for vendored frameworks and libraries.
+        #
+        # @param [PodTarget] target
+        #        The pod target, which holds the list of +Spec::FileAccessor+.
+        #
+        # @param [Xcodeproj::Config] xcconfig
+        #        The xcconfig to edit.
+        #
+        def self.add_vendored_dependency_build_settings(target, xcconfig)
+          if target.requires_frameworks?
+            target.dependent_targets.each do |dependent_target|
+              XCConfigHelper.add_vendored_dependency_build_settings(dependent_target, xcconfig)
+            end
+          end
+
+          target.file_accessors.each do |file_accessor|
             file_accessor.vendored_frameworks.each do |vendored_framework|
               XCConfigHelper.add_framework_build_settings(vendored_framework, xcconfig, target.sandbox.root)
             end
@@ -91,7 +111,7 @@ module Pod
         #
         def self.add_framework_build_settings(framework_path, xcconfig, sandbox_root)
           name = File.basename(framework_path, '.framework')
-          dirname = '$(PODS_ROOT)/' + framework_path.dirname.relative_path_from(sandbox_root).to_s
+          dirname = '${PODS_ROOT}/' + framework_path.dirname.relative_path_from(sandbox_root).to_s
           build_settings = {
             'OTHER_LDFLAGS' => "-framework #{name}",
             'FRAMEWORK_SEARCH_PATHS' => quote([dirname]),
@@ -113,7 +133,7 @@ module Pod
         #
         def self.add_library_build_settings(library_path, xcconfig, sandbox_root)
           name = File.basename(library_path, '.a').sub(/\Alib/, '')
-          dirname = '$(PODS_ROOT)/' + library_path.dirname.relative_path_from(sandbox_root).to_s
+          dirname = '${PODS_ROOT}/' + library_path.dirname.relative_path_from(sandbox_root).to_s
           build_settings = {
             'OTHER_LDFLAGS' => "-l#{name}",
             'LIBRARY_SEARCH_PATHS' => '$(inherited) ' + quote([dirname]),

data/lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb

@@ -24,7 +24,7 @@ module Pod
             explicit_dependencies = lockfile.to_hash['DEPENDENCIES'] || []
             explicit_dependencies.each do |string|
               dependency = Dependency.new(string)
-              dependency_graph.add_root_vertex(dependency.name, nil)
+              dependency_graph.add_vertex(dependency.name, nil, true)
             end
 
             pods = lockfile.to_hash['PODS'] || []

data/lib/cocoapods/installer/target_installer/aggregate_target_installer.rb

@@ -47,6 +47,7 @@ module Pod
           'OTHER_LIBTOOLFLAGS' => '',
           'PODS_ROOT'          => '$(SRCROOT)',
           'SKIP_INSTALL'       => 'YES',
+          'MACH_O_TYPE'        => 'staticlib',
         }
         super.merge(settings)
       end

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -127,13 +127,36 @@ module Pod
         # @todo   This can be removed for CocoaPods 1.0
         #
         def update_to_cocoapods_0_39
-          requires_update = native_targets_to_embed_in.any? do |target|
-            !target.shell_script_build_phases.find { |bp| bp.name == 'Embed Pods Frameworks' }
+          targets_to_embed = native_targets.select do |target|
+            EMBED_FRAMEWORK_TARGET_TYPES.include?(target.symbol_type)
+          end
+          requires_update = targets_to_embed.any? do |target|
+            !target.shell_script_build_phases.find { |bp| bp.name == EMBED_FRAMEWORK_PHASE_NAME }
           end
           if requires_update
-            add_embed_frameworks_script_phase
-            true
+            targets_to_embed.each do |native_target|
+              add_embed_frameworks_script_phase_to_target(native_target)
+            end
+          end
+
+          frameworks = user_project.frameworks_group
+          native_targets.each do |native_target|
+            build_phase = native_target.frameworks_build_phase
+
+            product_ref = frameworks.files.find { |f| f.path == target.product_name }
+            if product_ref
+              build_file = build_phase.build_file(product_ref)
+              if build_file &&
+                  build_file.settings.is_a?(Hash) &&
+                  build_file.settings['ATTRIBUTES'].is_a?(Array) &&
+                  build_file.settings['ATTRIBUTES'].include?('Weak')
+                build_file.settings = nil
+                requires_update = true
+              end
+            end
           end
+
+          requires_update
         end
 
         # Adds spec product reference to the frameworks build phase of the
@@ -161,15 +184,8 @@ module Pod
             target_basename = target.product_basename
             new_product_ref = frameworks.files.find { |f| f.path == target.product_name } ||
               frameworks.new_product_ref_for_target(target_basename, target.product_type)
-            build_file = build_phase.build_file(new_product_ref) ||
+            build_phase.build_file(new_product_ref) ||
               build_phase.add_file_reference(new_product_ref, true)
-            if target.requires_frameworks?
-              # Weak link the aggregate target's product, because as it contains
-              # no symbols, it isn't copied into the app bundle. dyld will so
-              # never try to find the missing executable at runtime.
-              build_file.settings ||= {}
-              build_file.settings['ATTRIBUTES'] = ['Weak']
-            end
           end
         end
 
@@ -179,12 +195,16 @@ module Pod
         #
         def add_embed_frameworks_script_phase
           native_targets_to_embed_in.each do |native_target|
-            phase = create_or_update_build_phase(native_target, EMBED_FRAMEWORK_PHASE_NAME)
-            script_path = target.embed_frameworks_script_relative_path
-            phase.shell_script = %("#{script_path}"\n)
+            add_embed_frameworks_script_phase_to_target(native_target)
           end
         end
 
+        def add_embed_frameworks_script_phase_to_target(native_target)
+          phase = create_or_update_build_phase(native_target, EMBED_FRAMEWORK_PHASE_NAME)
+          script_path = target.embed_frameworks_script_relative_path
+          phase.shell_script = %("#{script_path}"\n)
+        end
+
         # Delete a 'Embed Pods Frameworks' Copy Files Build Phase if present
         #
         # @param [PBXNativeTarget] native_target

data/lib/cocoapods/resolver.rb

@@ -422,12 +422,9 @@ module Pod
     #
     # @return [Bool]
     def spec_is_platform_compatible?(dependency_graph, dependency, spec)
-      all_predecessors = ->(vertex) do
-        pred = vertex.predecessors
-        pred + pred.map(&all_predecessors).reduce(Set.new, &:|) << vertex
-      end
       vertex = dependency_graph.vertex_named(dependency.name)
-      predecessors = all_predecessors[vertex].reject { |v| !dependency_graph.root_vertex_named(v.name) }
+      predecessors = vertex.recursive_predecessors.select(&:root)
+      predecessors << vertex if vertex.root?
       platforms_to_satisfy = predecessors.flat_map(&:explicit_requirements).flat_map { |r| @platforms_by_dependency[r] }
 
       platforms_to_satisfy.all? do |platform_to_satisfy|
@@ -461,9 +458,7 @@ module Pod
     def edge_is_valid_for_target?(edge, target)
       dependencies_for_target_platform =
         edge.origin.payload.all_dependencies(target.platform).map(&:name)
-      edge.requirements.any? do |dependency|
-        dependencies_for_target_platform.include?(dependency.name)
-      end
+      dependencies_for_target_platform.include?(edge.requirement.name)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.39.0.beta.5
+  version: 0.39.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0.beta.5
+        version: 0.39.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0.beta.5
+        version: 0.39.0.rc.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
@@ -103,14 +103,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-try
   requirement: !ruby/object:Gem::Requirement
@@ -145,14 +145,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement