cocoapods 1.7.0.beta.2 → 1.7.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 91a0b13ca93c3781d072736e1e1ff9d200dd43c9
-  data.tar.gz: '0265518cae07022eca43ac72ae9e011dbc9b93bc'
+SHA256:
+  metadata.gz: 1ee8d12451f183094a65d40b6e47d8748aa0fa4eea250c41d9c7a5f482f955b1
+  data.tar.gz: 53769ab0555e4c167f0157a9531d0218b920a005363ac53f838a6e0aba13f844
 SHA512:
-  metadata.gz: faf6624fea1e6e33486154b899249c986058e121801e50109ec60fad4c4ee10f3b9669b5a814d2c1a7915e6013cc7d7870942a9b1898e28b53d049876b54388f
-  data.tar.gz: 9d102fcddf3d7e680fdfa3d9a6665be1a644ebf8b9489556f084c5d0d2fe71be5187f04427f2fd803730344c50c5b5cb30b18083406d3c942fac145d85b6f28a
+  metadata.gz: 3b5533caea792d552f80b53b9003f1929e6ddb730ea85f53b46572fdc2077088df36ddf1d0e9673f7d8b9c647944ec04c025e2f4b3183930598230da1c8f0834
+  data.tar.gz: 4741c555db345c178def609f871abd490ed023dc88c9ee18e32fa7a6fbb01b4d73a1ffd89e94bf9e98917281d3641dcaa7ff1fc614fc61e99ca946b45d451316

data/CHANGELOG.md

@@ -4,6 +4,25 @@ 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.beta.3 (2019-03-28)
+
+##### Enhancements
+
+* Adds support for referring to other podspecs during validation  
+  [Orta Therox](https://github.com/orta)
+  [#8536](https://github.com/CocoaPods/CocoaPods/pull/8536)
+
+##### Bug Fixes
+
+* Deintegrate deleted targets even if `incremental_installation` is turned on.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso) & [Doug Mead](https://github.com/dmead28)
+  [#8638](https://github.com/CocoaPods/CocoaPods/pull/8638)
+
+* Reduce the probability of multiple project UUID collisions.  
+  [Sebastian Shanus](https://github.com/sebastianv1)
+  [#8636](https://github.com/CocoaPods/CocoaPods/pull/8636)
+
+
 ## 1.7.0.beta.2 (2019-03-08)
 
 ##### Enhancements
@@ -42,6 +61,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [tripleCC](https://github.com/tripleCC)
   [#7958](https://github.com/CocoaPods/CocoaPods/issues/7958)
 
+* Fix crash when running `pod update` with `--sources` and `--project-directory`  
+  [tripleCC](https://github.com/tripleCC)
+  [#8565](https://github.com/CocoaPods/CocoaPods/issues/8565)
+
 * Do not use spaces around variable assignment in generated embed framework script  
   [florianbuerger](https://github.com/florianbuerger)
   [#8548](https://github.com/CocoaPods/CocoaPods/pull/8548)
@@ -49,6 +72,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 * Do not link specs into user targets that are only used by app specs.  
   [Samuel Giddins](https://github.com/segiddins)
 
+
 ## 1.7.0.beta.1 (2019-02-22)
 
 ##### Enhancements
@@ -57,7 +81,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [dacaiguoguogmail](https://github.com/dacaiguoguogmail)
   [#8461](https://github.com/CocoaPods/CocoaPods/issues/8461)
 
-* Set the path of development pod groups to root directory of the Pod 
+* Set the path of development pod groups to root directory of the Pod  
   [Eric Amorde](https://github.com/amorde)
   [#8445](https://github.com/CocoaPods/CocoaPods/pull/8445)
   [#8503](https://github.com/CocoaPods/CocoaPods/pull/8503)

data/lib/cocoapods/command/lib/lint.rb

@@ -31,24 +31,29 @@ module Pod
             ['--private', 'Lint skips checks that apply only to public specs'],
             ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
              'This takes precedence over the Swift versions specified by the spec or a `.swift-version` file.'],
+            ['--include-podspecs=**/*.podspec', 'Additional ancillary podspecs which are used for linting via :path.'],
+            ['--external-podspecs=**/*.podspec', 'Additional ancillary podspecs which are used for linting '\
+              'via :podspec. If there are --include-podspecs, then these are removed from them.'],
             ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
             ['--skip-tests', 'Lint skips building and running tests during validation'],
           ].concat(super)
         end
 
         def initialize(argv)
-          @quick           = argv.flag?('quick')
-          @allow_warnings  = argv.flag?('allow-warnings')
-          @clean           = argv.flag?('clean', true)
-          @fail_fast       = argv.flag?('fail-fast', false)
-          @subspecs        = argv.flag?('subspecs', true)
-          @only_subspec    = argv.option('subspec')
-          @use_frameworks  = !argv.flag?('use-libraries')
+          @quick               = argv.flag?('quick')
+          @allow_warnings      = argv.flag?('allow-warnings')
+          @clean               = argv.flag?('clean', true)
+          @fail_fast           = argv.flag?('fail-fast', false)
+          @subspecs            = argv.flag?('subspecs', true)
+          @only_subspec        = argv.option('subspec')
+          @use_frameworks      = !argv.flag?('use-libraries')
           @use_modular_headers = argv.flag?('use-modular-headers')
-          @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
-          @platforms       = argv.option('platforms', '').split(',')
-          @private         = argv.flag?('private', false)
-          @swift_version   = argv.option('swift-version', nil)
+          @source_urls         = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
+          @platforms           = argv.option('platforms', '').split(',')
+          @private             = argv.flag?('private', false)
+          @swift_version       = argv.option('swift-version', nil)
+          @include_podspecs    = argv.option('include-podspecs', nil)
+          @external_podspecs   = argv.option('external-podspecs', nil)
           @skip_import_validation = argv.flag?('skip-import-validation', false)
           @skip_tests = argv.flag?('skip-tests', false)
           @podspecs_paths = argv.arguments!
@@ -76,6 +81,8 @@ module Pod
             validator.swift_version = @swift_version
             validator.skip_import_validation = @skip_import_validation
             validator.skip_tests = @skip_tests
+            validator.include_podspecs = @include_podspecs
+            validator.external_podspecs = @external_podspecs
             validator.validate
 
             unless @clean

data/lib/cocoapods/command/update.rb

@@ -29,47 +29,45 @@ module Pod
       end
 
       def initialize(argv)
-        @pods = argv.arguments! unless argv.arguments.empty?
+        @pods = argv.arguments!
 
-        source_urls = argv.option('sources', '').split(',')
-        excluded_pods = argv.option('exclude-pods', '').split(',')
+        @source_urls = argv.option('sources', '').split(',')
+        @excluded_pods = argv.option('exclude-pods', '').split(',')
         @clean_install = argv.flag?('clean-install', false)
-        unless source_urls.empty?
-          source_pods = source_urls.flat_map { |url| config.sources_manager.source_with_name_or_url(url).pods }
-          unless source_pods.empty?
-            source_pods = source_pods.select { |pod| config.lockfile.pod_names.include?(pod) }
-            if @pods
-              @pods += source_pods
-            else
-              @pods = source_pods unless source_pods.empty?
-            end
-          end
-        end
+        @source_pods = @source_urls.flat_map { |url| config.sources_manager.source_with_name_or_url(url).pods }
 
-        unless excluded_pods.empty?
-          @pods ||= config.lockfile.pod_names.dup
+        super
+      end
 
-          non_installed_pods = (excluded_pods - @pods)
-          unless non_installed_pods.empty?
-            pluralized_words = non_installed_pods.length > 1 ? %w(Pods are) : %w(Pod is)
-            message = "Trying to skip `#{non_installed_pods.join('`, `')}` #{pluralized_words.first} " \
-                    "which #{pluralized_words.last} not installed"
-            raise Informative, message
-          end
+      def run
+        verify_podfile_exists!
 
-          @pods.delete_if { |pod| excluded_pods.include?(pod) }
-        end
+        installer = installer_for_config
+        installer.repo_update = repo_update?(:default => true)
+        installer.clean_install = @clean_install
+        if @pods.any? || @excluded_pods.any? || @source_pods.any?
+          verify_lockfile_exists!
+          verify_pods_are_installed!
+          verify_excluded_pods_are_installed!
 
-        super
+          @pods += @source_pods.select { |pod| config.lockfile.pod_names.include?(pod) }
+          @pods = config.lockfile.pod_names.dup if @pods.empty?
+          @pods -= @excluded_pods
+
+          installer.update = { :pods => @pods }
+        else
+          UI.puts 'Update all pods'.yellow
+          installer.update = true
+        end
+        installer.install!
       end
 
+      private
+
       # Check if all given pods are installed
       #
       def verify_pods_are_installed!
-        lockfile_roots = config.lockfile.pod_names.map { |p| Specification.root_name(p) }
-        missing_pods = @pods.map { |p| Specification.root_name(p) }.select do |pod|
-          !lockfile_roots.include?(pod)
-        end
+        missing_pods = lockfile_missing_pods(@pods)
 
         unless missing_pods.empty?
           message = if missing_pods.length > 1
@@ -83,21 +81,22 @@ module Pod
         end
       end
 
-      def run
-        verify_podfile_exists!
+      # Check if excluded pods are installed
+      #
+      def verify_excluded_pods_are_installed!
+        missing_pods = lockfile_missing_pods(@excluded_pods)
 
-        installer = installer_for_config
-        installer.repo_update = repo_update?(:default => true)
-        installer.clean_install = @clean_install
-        if @pods
-          verify_lockfile_exists!
-          verify_pods_are_installed!
-          installer.update = { :pods => @pods }
-        else
-          UI.puts 'Update all pods'.yellow
-          installer.update = true
+        unless missing_pods.empty?
+          pluralized_words = missing_pods.length > 1 ? %w(Pods are) : %w(Pod is)
+          message = "Trying to skip `#{missing_pods.join('`, `')}` #{pluralized_words.first} " \
+                  "which #{pluralized_words.last} not installed"
+          raise Informative, message
         end
-        installer.install!
+      end
+
+      def lockfile_missing_pods(pods)
+        lockfile_roots = config.lockfile.pod_names.map { |pod| Specification.root_name(pod) }
+        pods.map { |pod| Specification.root_name(pod) }.uniq - lockfile_roots
       end
     end
   end

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/installer.rb

@@ -179,7 +179,7 @@ module Pod
           @metadata_cache = ProjectCache::ProjectMetadataCache.from_file(sandbox.project_metadata_cache_path)
           @project_cache_version = ProjectCache::ProjectCacheVersion.from_file(sandbox.project_version_cache_path)
 
-          force_clean_install = clean_install || project_cache_version.version != Version.create(VersionMetadata.gem_version)
+          force_clean_install = clean_install || project_cache_version.version != Version.create(VersionMetadata.project_cache_version)
           cache_result = ProjectCache::ProjectCacheAnalyzer.new(sandbox, installation_cache, analysis_result.all_user_build_configurations,
                                                                 object_version, pod_targets, aggregate_targets, :clean_install => force_clean_install).analyze
           aggregate_targets_to_generate = cache_result.aggregate_targets_to_generate || []
@@ -459,7 +459,7 @@ module Pod
       new_lockfile = generate_lockfile
       return if new_lockfile == lockfile
 
-      diff = Xcodeproj::Differ.hash_diff(lockfile.to_hash, new_lockfile.to_hash, :key_1 => 'Old Lockfile', :key_2 => 'New Lockfile')
+      return unless diff = Xcodeproj::Differ.hash_diff(lockfile.to_hash, new_lockfile.to_hash, :key_1 => 'Old Lockfile', :key_2 => 'New Lockfile')
       pretty_diff = YAMLHelper.convert_hash(diff, Lockfile::HASH_KEY_ORDER, "\n\n")
       pretty_diff.gsub!(':diff:', 'diff:'.yellow)
 
@@ -761,7 +761,7 @@ module Pod
                                       target_installation_results.aggregate_target_installation_results || {})
       metadata_cache.save_as(sandbox.project_metadata_cache_path)
 
-      cache_version = ProjectCache::ProjectCacheVersion.new(VersionMetadata.gem_version)
+      cache_version = ProjectCache::ProjectCacheVersion.new(VersionMetadata.project_cache_version)
       cache_version.save_as(sandbox.project_version_cache_path)
     end
 
@@ -775,7 +775,8 @@ module Pod
     def integrate_user_project
       UI.section "Integrating client #{'project'.pluralize(aggregate_targets.map(&:user_project_path).uniq.count)}" do
         installation_root = config.installation_root
-        integrator = UserProjectIntegrator.new(podfile, sandbox, installation_root, generated_aggregate_targets, :use_input_output_paths => !installation_options.disable_input_output_paths?)
+        integrator = UserProjectIntegrator.new(podfile, sandbox, installation_root, aggregate_targets, generated_aggregate_targets,
+                                               :use_input_output_paths => !installation_options.disable_input_output_paths?)
         integrator.integrate!
       end
     end

data/lib/cocoapods/installer/podfile_validator.rb

@@ -138,7 +138,7 @@ module Pod
         @podfile_dependency_cache.target_definition_list.group_by { |td| [td.name, td.user_project_path] }.
           each do |(name, project), definitions|
           next unless definitions.size > 1
-          error = "The target `#{name}` is declared twice"
+          error = "The target `#{name}` is declared multiple times"
           error << " for the project `#{project}`" if project
           add_error(error << '.')
         end

data/lib/cocoapods/installer/project_cache/project_cache_analysis_result.rb

@@ -26,7 +26,7 @@ module Pod
         #
         attr_reader :build_configurations
 
-        # @return [String]
+        # @return [Integer]
         #         The project object version to install with each target.
         #
         attr_reader :project_object_version
@@ -37,7 +37,7 @@ module Pod
         # @param [Array<AggregateTarget] aggregate_targets_to_generate @see #aggregate_targets_to_generate
         # @param [Hash{String => TargetCacheKey}] cache_key_by_target_label @see #cache_key_by_target_label
         # @param [Hash{String => Symbol}] build_configurations @see #build_configurations
-        # @param [String] project_object_version @see #project_object_version
+        # @param [Integer] project_object_version @see #project_object_version
         #
         def initialize(pod_targets_to_generate, aggregate_targets_to_generate, cache_key_by_target_label,
                        build_configurations, project_object_version)

data/lib/cocoapods/installer/project_cache/project_cache_analyzer.rb

@@ -18,7 +18,7 @@ module Pod
         #
         attr_reader :build_configurations
 
-        # @return [String] The object version from the user project.
+        # @return [Integer] The object version from the user project.
         #
         attr_reader :project_object_version
 
@@ -39,7 +39,7 @@ module Pod
         # @param [Sandbox] sandbox @see #sandbox
         # @param [ProjectInstallationCache] cache @see #cache
         # @param [Hash{String => Symbol}] build_configurations @see #build_configurations
-        # @param [String] project_object_version @see #project_object_version
+        # @param [Integer] project_object_version @see #project_object_version
         # @param [Array<PodTarget>] pod_targets @see #pod_targets
         # @param [Array<AggregateTarget>] aggregate_targets @see #aggregate_targets
         # @param [Bool] clean_install @see #clean_install

data/lib/cocoapods/installer/project_cache/project_installation_cache.rb

@@ -16,7 +16,7 @@ module Pod
         #
         attr_reader :build_configurations
 
-        # @return [String]
+        # @return [Integer]
         #         Project object stored in the cache.
         #
         attr_reader :project_object_version
@@ -25,7 +25,7 @@ module Pod
         #
         # @param [Hash{String => TargetCacheKey}] cache_key_by_target_label @see #cache_key_by_target_label
         # @param [Hash{String => Symbol}] build_configurations @see #build_configurations
-        # @param [String] project_object_version @see #project_object_version
+        # @param [Integer] project_object_version @see #project_object_version
         #
         def initialize(cache_key_by_target_label = {}, build_configurations = nil, project_object_version = nil)
           @cache_key_by_target_label = cache_key_by_target_label

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -18,11 +18,8 @@ module Pod
       #
       attr_reader :podfile
 
-      # @return [Project] the pods project which contains the libraries to
-      #         integrate.
+      # @return [Sandbox] The sandbox used for this installation.
       #
-      # attr_reader :pods_project
-
       attr_reader :sandbox
 
       # @return [Pathname] the path of the installation.
@@ -37,23 +34,31 @@ module Pod
       #
       attr_reader :targets
 
+      # @return [Array<AggregateTarget>] the targets that require integration. This will always be equal or a smaller
+      #         subset of #targets.
+      #
+      attr_reader :targets_to_integrate
+
       # @return [Boolean] whether to use input/output paths for build phase scripts
       #
       attr_reader :use_input_output_paths
       alias use_input_output_paths? use_input_output_paths
 
-      # Init a new UserProjectIntegrator
+      # Initialize a new instance
       #
-      # @param  [Podfile]  podfile @see #podfile
-      # @param  [Sandbox]  sandbox @see #sandbox
+      # @param  [Podfile] podfile @see #podfile
+      # @param  [Sandbox] sandbox @see #sandbox
       # @param  [Pathname] installation_root @see #installation_root
       # @param  [Array<AggregateTarget>] targets @see #targets
+      # @param  [Array<AggregateTarget>] targets_to_integrate @see #targets_to_integrate
+      # @param  [Boolean] use_input_output_paths @see #use_input_output_paths
       #
-      def initialize(podfile, sandbox, installation_root, targets, use_input_output_paths: true)
+      def initialize(podfile, sandbox, installation_root, targets, targets_to_integrate, use_input_output_paths: true)
         @podfile = podfile
         @sandbox = sandbox
         @installation_root = installation_root
         @targets = targets
+        @targets_to_integrate = targets_to_integrate
         @use_input_output_paths = use_input_output_paths
       end
 
@@ -64,9 +69,11 @@ module Pod
       #
       def integrate!
         create_workspace
+        deintegrated_projects = deintegrate_removed_targets
         integrate_user_targets
         warn_about_xcconfig_overrides
-        save_projects
+        projects_to_save = (user_projects_to_integrate + deintegrated_projects).uniq
+        save_projects(projects_to_save)
       end
 
       #-----------------------------------------------------------------------#
@@ -85,7 +92,7 @@ module Pod
       # @return [void]
       #
       def create_workspace
-        all_projects = user_project_paths.sort.push(sandbox.project_path).uniq
+        all_projects = user_project_paths_to_integrate.sort.push(sandbox.project_path).uniq
         file_references = all_projects.map do |path|
           relative_path = path.relative_path_from(workspace_path.dirname).to_s
           Xcodeproj::Workspace::FileReference.new(relative_path, 'group')
@@ -106,6 +113,23 @@ module Pod
         end
       end
 
+      # Deintegrates the targets of the user projects that are no longer part of the installation.
+      #
+      # @return [Array<Xcodeproj::PBXProject>] The list of projects that were deintegrated.
+      #
+      def deintegrate_removed_targets
+        Config.instance.with_changes(:silent => true) do
+          deintegrator = Deintegrator.new
+          all_project_targets = user_projects.flat_map(&:native_targets).uniq
+          all_native_targets = targets.flat_map(&:user_targets).uniq
+          targets_to_deintegrate = all_project_targets - all_native_targets
+          targets_to_deintegrate.each do |target|
+            deintegrator.deintegrate_target(target)
+          end
+          return targets_to_deintegrate.map(&:project).select(&:dirty?).uniq
+        end
+      end
+
       # Integrates the targets of the user projects with the libraries
       # generated from the {Podfile}.
       #
@@ -119,26 +143,17 @@ module Pod
         target_integrators = targets_to_integrate.sort_by(&:name).map do |target|
           TargetIntegrator.new(target, :use_input_output_paths => use_input_output_paths?)
         end
-
-        Config.instance.with_changes(:silent => true) do
-          deintegrator = Deintegrator.new
-          all_project_targets = user_projects.flat_map(&:native_targets).uniq
-          all_native_targets = targets_to_integrate.flat_map(&:user_targets).uniq
-          targets_to_deintegrate = all_project_targets - all_native_targets
-          targets_to_deintegrate.each do |target|
-            deintegrator.deintegrate_target(target)
-          end
-        end
-
         target_integrators.each(&:integrate!)
       end
 
       # Save all user projects.
       #
+      # @param [Array<Xcodeproj::PBXProject>] projects The projects to save.
+      #
       # @return [void]
       #
-      def save_projects
-        user_projects.each do |project|
+      def save_projects(projects)
+        projects.each do |project|
           if project.dirty?
             project.save
           else
@@ -163,7 +178,7 @@ module Pod
       # warning to inform the user if needed.
       #
       def warn_about_xcconfig_overrides
-        targets.each do |aggregate_target|
+        targets_to_integrate.each do |aggregate_target|
           aggregate_target.user_targets.each do |user_target|
             user_target.build_configurations.each do |config|
               xcconfig = aggregate_target.xcconfigs[config.name]
@@ -207,20 +222,38 @@ module Pod
       end
 
       # @return [Array<Pathname>] the paths of all the user projects referenced
-      #         by the target definitions.
+      #         by the targets that require integration.
       #
       # @note   Empty target definitions are ignored.
       #
-      def user_project_paths
-        targets.map(&:user_project_path).compact.uniq
+      def user_project_paths_to_integrate
+        targets_to_integrate.map(&:user_project_path).compact.uniq
+      end
+
+      # @return [Array<Xcodeproj::Project>] the projects of all the targets that require integration.
+      #
+      # @note   Empty target definitions are ignored.
+      #
+      def user_projects_to_integrate
+        targets_to_integrate.map(&:user_project).compact.uniq
       end
 
+      # @return [Array<Xcodeproj::Project>] the projects of all the targets regardless of whether they are integrated
+      #         or not.
+      #
+      # @note   Empty target definitions are ignored.
+      #
       def user_projects
         targets.map(&:user_project).compact.uniq
       end
 
-      def targets_to_integrate
-        targets
+      # @return [Array<Pathname>] the paths of all the user projects from all targets regardless of whether they are
+      #         integrated or not.
+      #
+      # @note   Empty target definitions are ignored.
+      #
+      def user_project_paths
+        targets.map(&:user_project_path).compact.uniq
       end
 
       # Prints a warning informing the user that a build configuration of
@@ -229,7 +262,7 @@ module Pod
       # @param  [Target::AggregateTarget] aggregate_target
       #         The umbrella target.
       #
-      # @param  [XcodeProj::PBXNativeTarget] user_target
+      # @param  [Xcodeproj::PBXNativeTarget] user_target
       #         The native target.
       #
       # @param  [Xcodeproj::XCBuildConfiguration] config

data/lib/cocoapods/installer/xcode/multi_pods_project_generator.rb

@@ -40,8 +40,7 @@ module Pod
 
         def create_pods_project(pod_targets, path, parent_project)
           platforms = pod_targets.map(&:platform)
-          project = ProjectGenerator.new(sandbox, path,
-                                         pod_targets, build_configurations, platforms,
+          project = ProjectGenerator.new(sandbox, path, pod_targets, build_configurations, platforms,
                                          project_object_version, false, :pod_target_subproject => true).generate!
           # Instead of saving every subproject to disk, we can optimize this by creating a temporary folder
           # the file reference can use so that we only have to call `save` once for all projects.

data/lib/cocoapods/installer/xcode/pods_project_generator.rb

@@ -43,7 +43,7 @@ module Pod
         #
         attr_reader :config
 
-        # @return [String] the object version for the projects we will generate.
+        # @return [Integer] the object version for the projects we will generate.
         #
         attr_reader :project_object_version
 
@@ -59,7 +59,7 @@ module Pod
         # @param  [Hash{String => Symbol}] build_configurations   @see #build_configurations
         # @param  [InstallationOptions]    installation_options   @see #installation_options
         # @param  [Config]                 config                 @see #config
-        # @param  [String]                 project_object_version @see #project_object_version
+        # @param  [Integer]                project_object_version @see #project_object_version
         # @param  [ProjectMetadataCache]   metadata_cache         @see #metadata_cache
         #
         def initialize(sandbox, aggregate_targets, pod_targets, build_configurations, installation_options, config,

data/lib/cocoapods/project.rb

@@ -69,7 +69,7 @@ module Pod
     #
     def generate_available_uuid_list(count = 100)
       start = @generated_uuids.size
-      uniques = Array.new(count) { |i| format('%.4s%07X0', @uuid_prefix, start + i) }
+      uniques = Array.new(count) { |i| format('%.6s%07X0', @uuid_prefix, start + i) }
       @generated_uuids += uniques
       @available_uuids += uniques
     end

data/lib/cocoapods/validator.rb

@@ -197,7 +197,7 @@ module Pod
 
     #-------------------------------------------------------------------------#
 
-    #  @!group Configuration
+    #  @!group Configuration
 
     # @return [Bool] whether the validation should skip the checks that
     #         requires the download of the library.
@@ -252,6 +252,16 @@ module Pod
     #
     attr_accessor :ignore_public_only_results
 
+    # @return [String] A glob for podspecs to be used during building of
+    #         the local Podfile via :path.
+    #
+    attr_accessor :include_podspecs
+
+    # @return [String] A glob for podspecs to be used during building of
+    #         the local Podfile via :podspec.
+    #
+    attr_accessor :external_podspecs
+
     attr_accessor :skip_import_validation
     alias_method :skip_import_validation?, :skip_import_validation
 
@@ -894,6 +904,10 @@ module Pod
       podspec  = file.realpath
       local    = local?
       urls     = source_urls
+
+      additional_podspec_pods = external_podspecs ? Dir.glob(external_podspecs) : []
+      additional_path_pods = (include_podspecs ? Dir.glob(include_podspecs) : []) .select { |path| spec.name != Specification.from_file(path).name } - additional_podspec_pods
+
       Pod::Podfile.new do
         install! 'cocoapods', :deterministic_uuids => false
         # By default inhibit warnings for all pods, except the one being validated.
@@ -908,6 +922,17 @@ module Pod
           else
             pod name, :podspec => podspec.to_s, :inhibit_warnings => false
           end
+
+          additional_path_pods.each do |podspec_path|
+            podspec_name = File.basename(podspec_path, '.*')
+            pod podspec_name, :path => File.dirname(podspec_path)
+          end
+
+          additional_podspec_pods.each do |podspec_path|
+            podspec_name = File.basename(podspec_path, '.*')
+            pod podspec_name, :podspec => podspec_path
+          end
+
           test_spec_names.each do |test_spec_name|
             if local
               pod test_spec_name, :path => podspec.dirname.to_s, :inhibit_warnings => false

data/lib/cocoapods/version_metadata.rb

@@ -3,5 +3,9 @@ module Pod
     def self.gem_version
       Pod::VERSION
     end
+
+    def self.project_cache_version
+      VersionMetadata.gem_version
+    end
   end
 end

metadata

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