cocoapods 1.5.2 → 1.6.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2019-02-21 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.5.2
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -153,7 +153,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -163,7 +163,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -193,21 +193,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.7
+        version: 1.8.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.7
+        version: 1.8.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -273,16 +273,22 @@ dependencies:
   name: fourflusher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: gh_inspector
   requirement: !ruby/object:Gem::Requirement
@@ -317,14 +323,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -454,10 +460,6 @@ files:
 - lib/cocoapods/generator/module_map.rb
 - lib/cocoapods/generator/prefix_header.rb
 - lib/cocoapods/generator/umbrella_header.rb
-- lib/cocoapods/generator/xcconfig.rb
-- lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
-- lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
-- lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
 - lib/cocoapods/hooks_manager.rb
 - lib/cocoapods/installer.rb
 - lib/cocoapods/installer/analyzer.rb
@@ -483,15 +485,19 @@ files:
 - lib/cocoapods/installer/xcode.rb
 - lib/cocoapods/installer/xcode/pods_project_generator.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/app_host_installer.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/target_installation_result.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/target_installer.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/target_installer_helper.rb
 - lib/cocoapods/installer/xcode/target_validator.rb
 - lib/cocoapods/open-uri.rb
 - lib/cocoapods/project.rb
 - lib/cocoapods/resolver.rb
 - lib/cocoapods/resolver/lazy_specification.rb
+- lib/cocoapods/resolver/resolver_specification.rb
 - lib/cocoapods/sandbox.rb
 - lib/cocoapods/sandbox/file_accessor.rb
 - lib/cocoapods/sandbox/headers_store.rb
@@ -501,6 +507,8 @@ files:
 - lib/cocoapods/sources_manager.rb
 - lib/cocoapods/target.rb
 - lib/cocoapods/target/aggregate_target.rb
+- lib/cocoapods/target/build_settings.rb
+- lib/cocoapods/target/framework_paths.rb
 - lib/cocoapods/target/pod_target.rb
 - lib/cocoapods/user_interface.rb
 - lib/cocoapods/user_interface/error_report.rb
@@ -526,7 +534,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.

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

@@ -1,260 +0,0 @@
-module Pod
-  module Generator
-    module XCConfig
-      # Generates the xcconfigs for the aggregate targets.
-      #
-      class AggregateXCConfig
-        # @return [AggregateTarget] the target represented by this xcconfig.
-        #
-        attr_reader :target
-
-        # @return [String] the name of the build configuration to generate this
-        #         xcconfig for.
-        #
-        attr_reader :configuration_name
-
-        # Initialize a new instance
-        #
-        # @param  [Target] target @see target
-        #
-        # @param  [String] configuration_name @see configuration_name
-        #
-        def initialize(target, configuration_name)
-          @target = target
-          @configuration_name = configuration_name
-        end
-
-        # @return [Xcodeproj::Config] The generated xcconfig.
-        #
-        attr_reader :xcconfig
-
-        # Generates and saves the xcconfig to the given path.
-        #
-        # @param  [Pathname] path
-        #         the path where the xcconfig should be stored.
-        #
-        # @return [void]
-        #
-        def save_as(path)
-          generate.save_as(path)
-        end
-
-        # Generates the xcconfig.
-        #
-        # @note   The xcconfig file for a Pods integration target includes the
-        #         namespaced xcconfig files for each spec target dependency.
-        #         Each namespaced configuration value is merged into the Pod
-        #         xcconfig file.
-        #
-        # @todo   This doesn't include the specs xcconfigs anymore and now the
-        #         logic is duplicated.
-        #
-        # @return [Xcodeproj::Config]
-        #
-        def generate
-          includes_static_libs = !target.requires_frameworks?
-          includes_static_libs ||= pod_targets.flat_map(&:file_accessors).any? { |fa| !fa.vendored_static_artifacts.empty? }
-          config = {
-            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ',
-            'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
-            'HEADER_SEARCH_PATHS' => '$(inherited) ',
-            'LIBRARY_SEARCH_PATHS' => '$(inherited) ',
-            'OTHER_CFLAGS' => '$(inherited) ',
-            'OTHER_LDFLAGS' => '$(inherited) ' + XCConfigHelper.default_ld_flags(target, includes_static_libs),
-            'OTHER_SWIFT_FLAGS' => '$(inherited) ',
-            'PODS_PODFILE_DIR_PATH' => target.podfile_dir_relative_path,
-            'PODS_ROOT' => target.relative_pods_root,
-            'SWIFT_INCLUDE_PATHS' => '$(inherited) ',
-          }.merge(embedded_content_settings)
-
-          @xcconfig = Xcodeproj::Config.new(config)
-
-          @xcconfig.merge!(merged_user_target_xcconfigs)
-
-          generate_settings_to_import_pod_targets
-
-          XCConfigHelper.add_target_specific_settings(target, @xcconfig)
-
-          targets = pod_targets + target.search_paths_aggregate_targets.flat_map(&:pod_targets)
-          XCConfigHelper.generate_vendored_build_settings(target, targets, @xcconfig)
-          XCConfigHelper.generate_other_ld_flags(target, pod_targets, @xcconfig)
-
-          # TODO: Need to decide how we are going to ensure settings like these
-          # are always excluded from the user's project.
-          #
-          # See https://github.com/CocoaPods/CocoaPods/issues/1216
-          @xcconfig.attributes.delete('USE_HEADERMAP')
-
-          # If any of the aggregate target dependencies bring in any vendored dynamic artifacts we should ensure to
-          # update the runpath search paths.
-          vendored_dynamic_artifacts = pod_targets.flat_map(&:file_accessors).flat_map(&:vendored_dynamic_artifacts)
-
-          symbol_type = target.user_targets.map(&:symbol_type).uniq.first
-          test_bundle = symbol_type == :octest_bundle || symbol_type == :unit_test_bundle || symbol_type == :ui_test_bundle
-          XCConfigHelper.generate_ld_runpath_search_paths(target, target.requires_host_target?, test_bundle, @xcconfig) if target.requires_frameworks? || vendored_dynamic_artifacts.count > 0
-
-          @xcconfig
-        end
-
-        #---------------------------------------------------------------------#
-
-        protected
-
-        # @return String the SWIFT_VERSION of the target being integrated
-        #
-        def target_swift_version
-          target.target_definition.swift_version unless target.target_definition.swift_version.blank?
-        end
-
-        EMBED_STANDARD_LIBRARIES_MINIMUM_VERSION = Gem::Version.new('2.3')
-
-        # @return [Hash<String, String>] the build settings necessary for Swift
-        #  targets to be correctly embedded in their host.
-        #
-        def embedded_content_settings
-          # For embedded targets, which live in a host target, CocoaPods
-          # copies all of the embedded target's pod_targets its host
-          # target. Therefore, this check will properly require the Swift
-          # libs in the host target, if the embedded target has any pod targets
-          # that use Swift. Setting this for the embedded target would
-          # cause an App Store rejection because frameworks cannot be embedded
-          # in embedded targets.
-
-          swift_version = Gem::Version.new(target_swift_version)
-          should_embed = !target.requires_host_target? && pod_targets.any?(&:uses_swift?)
-          config = {}
-          if should_embed
-            if swift_version >= EMBED_STANDARD_LIBRARIES_MINIMUM_VERSION
-              config['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = 'YES'
-            else
-              config['EMBEDDED_CONTENT_CONTAINS_SWIFT'] = 'YES'
-            end
-          end
-          config
-        end
-
-        # @return [Hash<String, String>] the build settings necessary to import
-        #         the pod targets.
-        #
-        def settings_to_import_pod_targets
-          if target.requires_frameworks?
-            build_pod_targets = pod_targets.select(&:should_build?)
-            framework_header_search_paths = build_pod_targets.map do |target|
-              "#{target.build_product_path}/Headers"
-            end
-            build_settings = {
-              # TODO: remove quote imports in CocoaPods 2.0
-              # Make framework headers discoverable by `import "…"`
-              'OTHER_CFLAGS' => XCConfigHelper.quote(framework_header_search_paths, '-iquote'),
-            }
-            if pod_targets.any? { |t| !t.should_build? }
-              # Make library headers discoverable by `#import "…"`
-              library_header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
-              # TODO: remove quote imports in CocoaPods 2.0
-              build_settings['HEADER_SEARCH_PATHS'] = XCConfigHelper.quote(library_header_search_paths)
-              build_settings['OTHER_CFLAGS'] += ' ' + XCConfigHelper.quote(library_header_search_paths, '-isystem')
-            end
-            build_settings
-          else
-            # Make headers discoverable from $PODS_ROOT/Headers directory
-            header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
-            {
-              # TODO: remove quote imports in CocoaPods 2.0
-              # by `#import "…"`
-              'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_paths),
-              # by `#import <…>`
-              'OTHER_CFLAGS' => XCConfigHelper.quote(header_search_paths, '-isystem'),
-            }
-          end
-        end
-
-        private
-
-        # Add build settings, which ensure that the pod targets can be imported from the integrating target.
-        # For >= 1.5.0 we use modular (stricter) header search paths this means that the integrated target will only be
-        # able to import public headers using `<>` or `@import` notation, but never import any private headers.
-        #
-        # For < 1.5.0 legacy header search paths the same rules apply: It's the wild west.
-        #
-        def generate_settings_to_import_pod_targets
-          @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, pod_targets)
-          @xcconfig.merge!(settings_to_import_pod_targets)
-          target.search_paths_aggregate_targets.each do |search_paths_target|
-            generator = AggregateXCConfig.new(search_paths_target, configuration_name)
-            @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(nil, search_paths_target.pod_targets)
-            @xcconfig.merge!(generator.settings_to_import_pod_targets)
-            # Propagate any HEADER_SEARCH_PATHS settings from the search paths.
-            XCConfigHelper.propagate_header_search_paths_from_search_paths(search_paths_target, @xcconfig)
-          end
-        end
-
-        private
-
-        #---------------------------------------------------------------------#
-
-        # !@group Private Helpers
-
-        # Returns the {PodTarget}s which are active for the current
-        # configuration name.
-        #
-        # @return [Array<PodTarget>]
-        #
-        def pod_targets
-          target.pod_targets_for_build_configuration(configuration_name)
-        end
-
-        # Returns the +user_target_xcconfig+ for all pod targets and their spec
-        # consumers grouped by keys
-        #
-        # @return [Hash{String,Hash{Target,String}]
-        #
-        def user_target_xcconfig_values_by_consumer_by_key
-          pod_targets.each_with_object({}) do |target, hash|
-            target.spec_consumers.each do |spec_consumer|
-              spec_consumer.user_target_xcconfig.each do |k, v|
-                (hash[k] ||= {})[spec_consumer] = v
-              end
-            end
-          end
-        end
-
-        # Merges the +user_target_xcconfig+ for all pod targets into the
-        # #xcconfig and warns on conflicting definitions.
-        #
-        # @return [Hash{String, String}]
-        #
-        def merged_user_target_xcconfigs
-          settings = user_target_xcconfig_values_by_consumer_by_key
-          settings.each_with_object({}) do |(key, values_by_consumer), xcconfig|
-            uniq_values = values_by_consumer.values.uniq
-            values_are_bools = uniq_values.all? { |v| v =~ /^(yes|no)$/i }
-            if values_are_bools
-              # Boolean build settings
-              if uniq_values.count > 1
-                UI.warn 'Can\'t merge user_target_xcconfig for pod targets: ' \
-                  "#{values_by_consumer.keys.map(&:name)}. Boolean build "\
-                  "setting #{key} has different values."
-              else
-                xcconfig[key] = uniq_values.first
-              end
-            elsif key =~ /S$/
-              # Plural build settings
-              xcconfig[key] = uniq_values.join(' ')
-            else
-              # Singular build settings
-              if uniq_values.count > 1
-                UI.warn 'Can\'t merge user_target_xcconfig for pod targets: ' \
-                  "#{values_by_consumer.keys.map(&:name)}. Singular build "\
-                  "setting #{key} has different values."
-              else
-                xcconfig[key] = uniq_values.first
-              end
-            end
-          end
-        end
-
-        #---------------------------------------------------------------------#
-      end
-    end
-  end
-end

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

@@ -1,87 +0,0 @@
-module Pod
-  module Generator
-    module XCConfig
-      # Generates the private xcconfigs for the pod targets.
-      #
-      # The xcconfig file for a Pod target merges the pod target
-      # configuration values with the default configuration values
-      # required by CocoaPods.
-      #
-      class PodXCConfig
-        # @return [Target] the target represented by this xcconfig.
-        #
-        attr_reader :target
-
-        # Initialize a new instance
-        #
-        # @param  [Target] target @see target
-        #
-        # @param  [Boolean] test_xcconfig
-        #         whether this is an xcconfig for a test native target.
-        #
-        def initialize(target, test_xcconfig = false)
-          @target = target
-          @test_xcconfig = test_xcconfig
-        end
-
-        # @return [Xcodeproj::Config] The generated xcconfig.
-        #
-        attr_reader :xcconfig
-
-        # Generates and saves the xcconfig to the given path.
-        #
-        # @param  [Pathname] path
-        #         the path where the prefix header should be stored.
-        #
-        # @return [void]
-        #
-        def save_as(path)
-          generate.save_as(path)
-        end
-
-        # Generates the xcconfig.
-        #
-        # @return [Xcodeproj::Config]
-        #
-        def generate
-          config = {
-            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ',
-            'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
-            'HEADER_SEARCH_PATHS' => '$(inherited) ' + XCConfigHelper.quote(target.header_search_paths(@test_xcconfig)),
-            'LIBRARY_SEARCH_PATHS' => '$(inherited) ',
-            'OTHER_CFLAGS' => '$(inherited) ',
-            'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target, @test_xcconfig),
-            'OTHER_SWIFT_FLAGS' => '$(inherited) ',
-            'PODS_ROOT' => '${SRCROOT}',
-            'PODS_TARGET_SRCROOT' => target.pod_target_srcroot,
-            'PRODUCT_BUNDLE_IDENTIFIER' => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}',
-            'SKIP_INSTALL' => 'YES',
-            'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => '$(inherited) ',
-            'SWIFT_INCLUDE_PATHS' => '$(inherited) ',
-          }
-
-          @xcconfig = Xcodeproj::Config.new(config)
-
-          XCConfigHelper.add_settings_for_file_accessors_of_target(nil, target, @xcconfig, true, @test_xcconfig)
-          target.file_accessors.each do |file_accessor|
-            @xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig) if @test_xcconfig == file_accessor.spec.test_specification?
-          end
-          XCConfigHelper.add_target_specific_settings(target, @xcconfig)
-          recursive_dependent_targets = target.recursive_dependent_targets
-          @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, recursive_dependent_targets, @test_xcconfig)
-          XCConfigHelper.generate_vendored_build_settings(target, recursive_dependent_targets, @xcconfig, false, @test_xcconfig)
-          if @test_xcconfig
-            test_dependent_targets = [target, *target.recursive_test_dependent_targets].uniq
-            @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, test_dependent_targets - recursive_dependent_targets, @test_xcconfig)
-            XCConfigHelper.generate_vendored_build_settings(nil, target.all_dependent_targets, @xcconfig, true, @test_xcconfig)
-            XCConfigHelper.generate_other_ld_flags(nil, target.all_dependent_targets, @xcconfig)
-            XCConfigHelper.generate_ld_runpath_search_paths(target, false, true, @xcconfig)
-          end
-          @xcconfig
-        end
-
-        #-----------------------------------------------------------------------#
-      end
-    end
-  end
-end