cocoapods 1.7.5 → 1.8.0.beta.1

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

@@ -60,32 +60,40 @@ module Pod
 
             input_paths_by_config = {}
             output_paths_by_config = {}
-            if use_input_output_paths
-              dependent_targets = if spec.test_specification?
-                                    target.dependent_targets_for_test_spec(spec)
-                                  else
-                                    target.dependent_targets_for_app_spec(spec)
-                                  end
-              resource_paths = dependent_targets.flat_map do |dependent_target|
-                spec_paths_to_include = dependent_target.library_specs.map(&:name)
-                spec_paths_to_include << spec.name if dependent_target == target
-                dependent_target.resource_paths.values_at(*spec_paths_to_include).flatten.compact
-              end.uniq
-
-              unless resource_paths.empty?
-                input_file_list_path = target.copy_resources_script_input_files_path_for_spec(spec)
-                input_file_list_relative_path = "${PODS_ROOT}/#{input_file_list_path.relative_path_from(target.sandbox.root)}"
-                input_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(input_file_list_path, input_file_list_relative_path)
-                input_paths_by_config[input_paths_key] = [script_path] + resource_paths
-
-                output_file_list_path = target.copy_resources_script_output_files_path_for_spec(spec)
-                output_file_list_relative_path = "${PODS_ROOT}/#{output_file_list_path.relative_path_from(target.sandbox.root)}"
-                output_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(output_file_list_path, output_file_list_relative_path)
-                output_paths_by_config[output_paths_key] = UserProjectIntegrator::TargetIntegrator.resource_output_paths(resource_paths)
-              end
+
+            dependent_targets = if spec.test_specification?
+                                  target.dependent_targets_for_test_spec(spec)
+                                else
+                                  target.dependent_targets_for_app_spec(spec)
+                                end
+            host_target_spec_names = target.app_host_dependent_targets_for_spec(spec).flat_map do |pt|
+              pt.specs.map(&:name)
+            end.uniq
+            resource_paths = dependent_targets.flat_map do |dependent_target|
+              spec_paths_to_include = dependent_target.library_specs.map(&:name)
+              spec_paths_to_include -= host_target_spec_names
+              spec_paths_to_include << spec.name if dependent_target == target
+              dependent_target.resource_paths.values_at(*spec_paths_to_include).flatten.compact
+            end.uniq
+
+            if use_input_output_paths? && !resource_paths.empty?
+              input_file_list_path = target.copy_resources_script_input_files_path_for_spec(spec)
+              input_file_list_relative_path = "${PODS_ROOT}/#{input_file_list_path.relative_path_from(target.sandbox.root)}"
+              input_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(input_file_list_path, input_file_list_relative_path)
+              input_paths_by_config[input_paths_key] = [script_path] + resource_paths
+
+              output_file_list_path = target.copy_resources_script_output_files_path_for_spec(spec)
+              output_file_list_relative_path = "${PODS_ROOT}/#{output_file_list_path.relative_path_from(target.sandbox.root)}"
+              output_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(output_file_list_path, output_file_list_relative_path)
+              output_paths_by_config[output_paths_key] = UserProjectIntegrator::TargetIntegrator.resource_output_paths(resource_paths)
             end
 
-            UserProjectIntegrator::TargetIntegrator.create_or_update_copy_resources_script_phase_to_target(native_target, script_path, input_paths_by_config, output_paths_by_config)
+            if resource_paths.empty?
+              UserProjectIntegrator::TargetIntegrator.remove_copy_resources_script_phase_from_target(native_target)
+            else
+              UserProjectIntegrator::TargetIntegrator.create_or_update_copy_resources_script_phase_to_target(
+                native_target, script_path, input_paths_by_config, output_paths_by_config)
+            end
           end
 
           # Find or create a 'Embed Pods Frameworks' Copy Files Build Phase
@@ -97,35 +105,43 @@ module Pod
 
             input_paths_by_config = {}
             output_paths_by_config = {}
-            if use_input_output_paths?
-              dependent_targets = if spec.test_specification?
-                                    target.dependent_targets_for_test_spec(spec)
-                                  else
-                                    target.dependent_targets_for_app_spec(spec)
-                                  end
-              framework_paths = dependent_targets.flat_map do |dependent_target|
-                spec_paths_to_include = dependent_target.library_specs.map(&:name)
-                spec_paths_to_include << spec.name if dependent_target == target
-                dependent_target.framework_paths.values_at(*spec_paths_to_include).flatten.compact
-              end.uniq
-
-              unless framework_paths.empty?
-                input_file_list_path = target.embed_frameworks_script_input_files_path_for_spec(spec)
-                input_file_list_relative_path = "${PODS_ROOT}/#{input_file_list_path.relative_path_from(target.sandbox.root)}"
-                input_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(input_file_list_path, input_file_list_relative_path)
-                input_paths = input_paths_by_config[input_paths_key] = [script_path]
-                framework_paths.each do |path|
-                  input_paths.concat(path.all_paths)
-                end
-
-                output_file_list_path = target.embed_frameworks_script_output_files_path_for_spec(spec)
-                output_file_list_relative_path = "${PODS_ROOT}/#{output_file_list_path.relative_path_from(target.sandbox.root)}"
-                output_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(output_file_list_path, output_file_list_relative_path)
-                output_paths_by_config[output_paths_key] = UserProjectIntegrator::TargetIntegrator.framework_output_paths(framework_paths)
+
+            dependent_targets = if spec.test_specification?
+                                  target.dependent_targets_for_test_spec(spec)
+                                else
+                                  target.dependent_targets_for_app_spec(spec)
+                                end
+            host_target_spec_names = target.app_host_dependent_targets_for_spec(spec).flat_map do |pt|
+              pt.specs.map(&:name)
+            end.uniq
+            framework_paths = dependent_targets.flat_map do |dependent_target|
+              spec_paths_to_include = dependent_target.library_specs.map(&:name)
+              spec_paths_to_include -= host_target_spec_names
+              spec_paths_to_include << spec.name if dependent_target == target
+              dependent_target.framework_paths.values_at(*spec_paths_to_include).flatten.compact
+            end.uniq
+
+            if use_input_output_paths? && !framework_paths.empty?
+              input_file_list_path = target.embed_frameworks_script_input_files_path_for_spec(spec)
+              input_file_list_relative_path = "${PODS_ROOT}/#{input_file_list_path.relative_path_from(target.sandbox.root)}"
+              input_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(input_file_list_path, input_file_list_relative_path)
+              input_paths = input_paths_by_config[input_paths_key] = [script_path]
+              framework_paths.each do |path|
+                input_paths.concat(path.all_paths)
               end
+
+              output_file_list_path = target.embed_frameworks_script_output_files_path_for_spec(spec)
+              output_file_list_relative_path = "${PODS_ROOT}/#{output_file_list_path.relative_path_from(target.sandbox.root)}"
+              output_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(output_file_list_path, output_file_list_relative_path)
+              output_paths_by_config[output_paths_key] = UserProjectIntegrator::TargetIntegrator.framework_output_paths(framework_paths)
             end
 
-            UserProjectIntegrator::TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths_by_config, output_paths_by_config)
+            if framework_paths.empty?
+              UserProjectIntegrator::TargetIntegrator.remove_embed_frameworks_script_phase_from_target(native_target)
+            else
+              UserProjectIntegrator::TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(
+                native_target, script_path, input_paths_by_config, output_paths_by_config)
+            end
           end
 
           # @return [String] the message that should be displayed for the target

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

@@ -110,6 +110,18 @@ module Pod
             test_specs_by_native_target.merge(app_specs_by_native_target)
           end
 
+          # @param label [String] the label of the app host target.
+          #
+          # @return [PBXNativeTarget] the app host target with the given target label.
+          #
+          def app_host_target_labelled(label)
+            app_native_targets.find do |app_native_target|
+              app_native_target.name == label
+            end || test_app_host_targets.find do |app_native_target|
+              app_native_target.name == label
+            end
+          end
+
           private
 
           def test_native_target_from_spec(spec)

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

@@ -135,10 +135,14 @@ module Pod
           # @param  [Symbol] bundle_package_type
           #         the CFBundlePackageType of the target this Info.plist file is for.
           #
+          # @param  [Hash] additional_entries
+          #         additional entries for the generated Info.plist
+          #
           # @return [void]
           #
-          def create_info_plist_file(path, native_target, version, platform, bundle_package_type = :fmwk)
-            create_info_plist_file_with_sandbox(@sandbox, path, native_target, version, platform, bundle_package_type)
+          def create_info_plist_file(path, native_target, version, platform, bundle_package_type = :fmwk, additional_entries: {})
+            create_info_plist_file_with_sandbox(@sandbox, path, native_target, version, platform, bundle_package_type,
+                                                :additional_entries => additional_entries)
             add_file_to_support_group(path)
           end
 

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

@@ -36,7 +36,7 @@ module Pod
           # @param  [PBXNativeTarget] native_target
           #         the native target to link the generated Info.plist file into.
           #
-          # @param  [Version] version
+          # @param  [String] version
           #         the version to use for when generating this Info.plist file.
           #
           # @param  [Platform] platform
@@ -51,7 +51,7 @@ module Pod
           # @return [void]
           #
           def create_info_plist_file_with_sandbox(sandbox, path, native_target, version, platform,
-                                                  bundle_package_type = :fmwk, additional_entries = {})
+                                                  bundle_package_type = :fmwk, additional_entries: {})
             UI.message "- Generating Info.plist file at #{UI.path(path)}" do
               generator = Generator::InfoPlistFile.new(version, platform, bundle_package_type, additional_entries)
               update_changed_file(generator, path)

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

@@ -5,8 +5,7 @@ module Pod
       # configuration is valid for installation.
       #
       class TargetValidator
-        # @return [Array<AggregateTarget>] The aggregate targets that should be
-        #                                  validated.
+        # @return [Array<AggregateTarget>] The aggregate targets that should be validated.
         #
         attr_reader :aggregate_targets
 
@@ -14,18 +13,21 @@ module Pod
         #
         attr_reader :pod_targets
 
+        # @return [InstallationOptions] The installation options used during this installation.
+        #
+        attr_reader :installation_options
+
         # Create a new TargetValidator with aggregate and pod targets to
         # validate.
         #
-        # @param [Array<AggregateTarget>] aggregate_targets
-        #                                 The aggregate targets to validate.
-        #
-        # @param [Array<PodTarget>] pod_targets
-        #                           The pod targets to validate.
+        # @param [Array<AggregateTarget>] aggregate_targets #see #aggregate_targets
+        # @param [Array<PodTarget>] pod_targets see #pod_targets
+        # @param [InstallationOptions] installation_options see #installation_options
         #
-        def initialize(aggregate_targets, pod_targets)
+        def initialize(aggregate_targets, pod_targets, installation_options)
           @aggregate_targets = aggregate_targets
           @pod_targets = pod_targets
+          @installation_options = installation_options
         end
 
         # Perform the validation steps for the provided aggregate and pod
@@ -36,15 +38,16 @@ module Pod
           verify_no_static_framework_transitive_dependencies
           verify_swift_pods_swift_version
           verify_swift_pods_have_module_dependencies
+          verify_no_multiple_project_names if installation_options.generate_multiple_pod_projects?
         end
 
         private
 
         def verify_no_duplicate_framework_and_library_names
           aggregate_targets.each do |aggregate_target|
-            aggregate_target.user_build_configurations.keys.each do |config|
+            aggregate_target.user_build_configurations.each_key do |config|
               pod_targets = aggregate_target.pod_targets_for_build_configuration(config)
-              file_accessors = pod_targets.flat_map(&:file_accessors)
+              file_accessors = pod_targets.flat_map(&:file_accessors).select { |fa| fa.spec.library_specification? }
 
               frameworks = file_accessors.flat_map(&:vendored_frameworks).uniq.map(&:basename)
               frameworks += pod_targets.select { |pt| pt.should_build? && pt.build_as_framework? }.map(&:product_module_name).uniq
@@ -58,7 +61,7 @@ module Pod
         end
 
         def verify_no_duplicate_names(names, label, type)
-          duplicates = names.map { |n| n.to_s.downcase }.group_by { |f| f }.select { |_, v| v.size > 1 }.keys
+          duplicates = names.group_by { |n| n.to_s.downcase }.select { |_, v| v.size > 1 }.keys
 
           unless duplicates.empty?
             raise Informative, "The '#{label}' target has " \
@@ -73,8 +76,8 @@ module Pod
               built_targets, unbuilt_targets = pod_targets.partition(&:should_build?)
               dynamic_pod_targets = built_targets.select(&:build_as_dynamic?)
 
-              dependencies = dynamic_pod_targets.flat_map(&:dependencies)
-              depended_upon_targets = unbuilt_targets.select { |t| dependencies.include?(t.pod_name) }
+              dependencies = dynamic_pod_targets.flat_map(&:dependent_targets).uniq
+              depended_upon_targets = unbuilt_targets & dependencies
 
               static_libs = depended_upon_targets.flat_map(&:file_accessors).flat_map(&:vendored_static_artifacts)
               unless static_libs.empty?
@@ -82,7 +85,7 @@ module Pod
                   "transitive dependencies that include statically linked binaries: (#{static_libs.to_sentence})"
               end
 
-              static_deps = dynamic_pod_targets.flat_map(&:recursive_dependent_targets).select(&:build_as_static?).uniq
+              static_deps = dynamic_pod_targets.flat_map(&:recursive_dependent_targets).uniq.select(&:build_as_static?)
               unless static_deps.empty?
                 raise Informative, "The '#{aggregate_target.label}' target has " \
                   "transitive dependencies that include statically linked binaries: (#{static_deps.flat_map(&:name).to_sentence})"
@@ -148,6 +151,19 @@ module Pod
           raise Informative, 'The following Swift pods cannot yet be integrated '\
                              "as static libraries:\n\n#{error_messages.join("\n\n")}"
         end
+
+        def verify_no_multiple_project_names
+          error_messages = pod_targets.map do |pod_target|
+            project_names = pod_target.target_definitions.map { |td| td.project_name_for_pod(pod_target.pod_name) }.compact.uniq
+            next unless project_names.count > 1
+            "- `#{pod_target.name}` specifies multiple project names (#{project_names.map { |pn| "`#{pn}`" }.to_sentence}) " \
+            "in different targets (#{pod_target.target_definitions.map { |td| "`#{td.name}`" }.to_sentence})."
+          end.compact
+          return if error_messages.empty?
+
+          raise Informative, 'The following pods cannot be integrated:' \
+                             "\n\n#{error_messages.join("\n\n")}"
+        end
       end
     end
   end

data/lib/cocoapods/native_target_extension.rb

@@ -2,6 +2,9 @@ module Pod
   class Project
     # Adds a dependency on the given metadata cache.
     #
+    # @param  [Sandbox] sandbox
+    #         The sandbox used for this installation.
+    #
     # @param  [AbstractTarget] target
     #         The parent target used to add a cached dependency.
     #
@@ -10,11 +13,11 @@ module Pod
     #
     # @return [void]
     #
-    def self.add_cached_dependency(target, metadata)
-      return if dependency_for_cached_target?(target, metadata)
+    def self.add_cached_dependency(sandbox, target, metadata)
+      return if dependency_for_cached_target?(sandbox, target, metadata)
       container_proxy = target.project.new(Xcodeproj::Project::PBXContainerItemProxy)
 
-      subproject_reference = target.project.reference_for_path(metadata.container_project_path)
+      subproject_reference = target.project.reference_for_path(sandbox.root + metadata.container_project_path)
       raise ArgumentError, "add_dependency received target (#{target}) that belongs to a project that is not this project (#{self}) and is not a subproject of this project" unless subproject_reference
       container_proxy.container_portal = subproject_reference.uuid
 
@@ -31,6 +34,9 @@ module Pod
 
     # Checks whether this target has a dependency on the given target.
     #
+    # @param  [Sandbox] sandbox
+    #         The sandbox used for this installation.
+    #
     # @param  [AbstractTarget] target
     #         The parent target used to add a cached dependency.
     #
@@ -39,10 +45,10 @@ module Pod
     #
     # @return [Bool]
     #
-    def self.dependency_for_cached_target?(target, cached_target)
+    def self.dependency_for_cached_target?(sandbox, target, cached_target)
       target.dependencies.find do |dep|
         if dep.target_proxy.remote?
-          subproject_reference = target.project.reference_for_path(cached_target.container_project_path)
+          subproject_reference = target.project.reference_for_path(sandbox.root + cached_target.container_project_path)
           uuid = subproject_reference.uuid if subproject_reference
           dep.target_proxy.remote_global_id_string == cached_target.native_target_uuid && dep.target_proxy.container_portal == uuid
         else

data/lib/cocoapods/open-uri.rb

@@ -1,4 +1,4 @@
-# rubocop:disable Style/FileName
+# rubocop:disable Naming/FileName
 
 require 'open-uri'
 

data/lib/cocoapods/project.rb

@@ -53,7 +53,7 @@ module Pod
       @development_pods = new_group('Development Pods')
       @dependencies_group = new_group('Dependencies')
       @pod_target_subproject = pod_target_subproject
-      @project_name = Pathname(path).basename('.*')
+      @project_name = Pathname(path).basename('.*').to_s
       self.symroot = LEGACY_BUILD_ROOT
     end
 
@@ -108,10 +108,10 @@ module Pod
     #         The path to the root of the Pod.
     #
     # @param  [Bool] development
-    #         Wether the group should be added to the Development Pods group.
+    #         Whether the group should be added to the Development Pods group.
     #
     # @param  [Bool] absolute
-    #         Wether the path of the group should be set as absolute.
+    #         Whether the path of the group should be set as absolute.
     #
     # @return [PBXGroup] The new group.
     #
@@ -150,6 +150,9 @@ module Pod
     # Creates a new subproject reference for the given cached metadata and configures its
     # group location.
     #
+    # @param [Sandbox] sandbox
+    #        The sandbox used for installation.
+    #
     # @param [TargetMetadata] metadata
     #        The project metadata to be added.
     #
@@ -159,9 +162,9 @@ module Pod
     #
     # @return [PBXFileReference] The new file reference.
     #
-    def add_cached_pod_subproject(metadata, development = false)
+    def add_cached_pod_subproject(sandbox, metadata, development = false)
       parent_group = group_for_subproject_reference(development)
-      add_cached_subproject_reference(metadata, parent_group)
+      add_cached_subproject_reference(sandbox, metadata, parent_group)
     end
 
     # @return [Array<PBXGroup>] Returns all the group of the Pods.
@@ -291,6 +294,9 @@ module Pod
 
     # Adds a file reference for a cached project as a child of the given group.
     #
+    # @param  [Sandbox] sandbox
+    #         The sandbox used for installation.
+    #
     # @param  [MetadataCache] metadata
     #         The metadata holding the required properties to create a subproject reference.
     #
@@ -299,8 +305,8 @@ module Pod
     #
     # @return [PBXFileReference] The new file reference.
     #
-    def add_cached_subproject_reference(metadata, group)
-      new_subproject_file_reference(metadata.container_project_path, group)
+    def add_cached_subproject_reference(sandbox, metadata, group)
+      new_subproject_file_reference(sandbox.root + metadata.container_project_path, group)
     end
 
     # Returns the file reference for the given absolute path.

data/lib/cocoapods/resolver.rb

@@ -39,6 +39,10 @@ module Pod
     attr_reader :specs_updated
     alias specs_updated? specs_updated
 
+    # @return [Source::Manager] the manager to use for dependency resolution
+    #
+    attr_reader :sources_manager
+
     # Init a new Resolver
     #
     # @param  [Sandbox] sandbox @see sandbox
@@ -50,17 +54,19 @@ module Pod
     #         within this Resolver.
     #
     def initialize(sandbox, podfile, locked_dependencies, sources, specs_updated,
-                   podfile_dependency_cache: Installer::Analyzer::PodfileDependencyCache.from_podfile(podfile))
+                   podfile_dependency_cache: Installer::Analyzer::PodfileDependencyCache.from_podfile(podfile),
+                   sources_manager: Config.instance.sources_manager)
       @sandbox = sandbox
       @podfile = podfile
       @locked_dependencies = locked_dependencies
       @sources = Array(sources)
       @specs_updated = specs_updated
       @podfile_dependency_cache = podfile_dependency_cache
+      @sources_manager = sources_manager
       @platforms_by_dependency = Hash.new { |h, k| h[k] = [] }
 
       @cached_sets = {}
-      @podfile_requirements_by_root_name = @podfile_dependency_cache.podfile_dependencies.group_by(&:root_name).each_value { |a| a.map!(&:requirement) }
+      @podfile_requirements_by_root_name = @podfile_dependency_cache.podfile_dependencies.group_by(&:root_name).each_value { |a| a.map!(&:requirement).freeze }.freeze
       @search = {}
       @validated_platforms = Set.new
     end
@@ -83,7 +89,7 @@ module Pod
           next unless target.platform
           @platforms_by_dependency[dep].push(target.platform)
         end
-      end
+      end.uniq
       @platforms_by_dependency.each_value(&:uniq!)
       @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, locked_dependencies)
       resolver_specs_by_target
@@ -99,15 +105,32 @@ module Pod
     def resolver_specs_by_target
       @resolver_specs_by_target ||= {}.tap do |resolver_specs_by_target|
         @podfile_dependency_cache.target_definition_list.each do |target|
+          next if target.abstract? && !target.platform
+
           # can't use vertex.root? since that considers _all_ targets
           explicit_dependencies = @podfile_dependency_cache.target_definition_dependencies(target).map(&:name).to_set
-          vertices = valid_dependencies_for_target(target)
 
-          resolver_specs_by_target[target] = vertices.
+          used_by_aggregate_target_by_spec_name = {}
+          used_vertices_by_spec_name = {}
+
+          # it's safe to make a single pass here since we iterate in topological order,
+          # so all of the predecessors have been visited before we get to a node.
+          # #tsort returns no-children vertices first, and we want them last (i.e. we want no-parent vertices first)
+          @activated.tsort.reverse_each do |vertex|
+            spec_name = vertex.name
+            explicitly_included = explicit_dependencies.include?(spec_name)
+            if explicitly_included || vertex.incoming_edges.any? { |edge| used_vertices_by_spec_name.key?(edge.origin.name) && edge_is_valid_for_target_platform?(edge, target.platform) }
+              validate_platform(vertex.payload, target)
+              used_vertices_by_spec_name[spec_name] = vertex
+              used_by_aggregate_target_by_spec_name[spec_name] = vertex.payload.library_specification? &&
+                (explicitly_included || vertex.predecessors.any? { |predecessor| used_by_aggregate_target_by_spec_name.fetch(predecessor.name, false) })
+            end
+          end
+
+          resolver_specs_by_target[target] = used_vertices_by_spec_name.each_value.
             map do |vertex|
               payload = vertex.payload
-              non_library = (!explicit_dependencies.include?(vertex.name) || payload.non_library_specification?) &&
-                (vertex.recursive_predecessors & vertices).all? { |v| !explicit_dependencies.include?(v.name) || v.payload.non_library_specification? }
+              non_library = !used_by_aggregate_target_by_spec_name.fetch(vertex.name)
               spec_source = payload.respond_to?(:spec_source) && payload.spec_source
               ResolverSpecification.new(payload, non_library, spec_source)
             end.
@@ -133,10 +156,13 @@ module Pod
     #
     def search_for(dependency)
       @search[dependency] ||= begin
-        locked_requirement = requirement_for_locked_pod_named(dependency.name)
-        podfile_deps = Array(@podfile_requirements_by_root_name[dependency.root_name])
-        podfile_deps << locked_requirement if locked_requirement
-        specifications_for_dependency(dependency, podfile_deps)
+        additional_requirements = if locked_requirement = requirement_for_locked_pod_named(dependency.name)
+                                    [locked_requirement]
+                                  else
+                                    Array(@podfile_requirements_by_root_name[dependency.root_name])
+                                  end
+
+        specifications_for_dependency(dependency, additional_requirements)
       end
       @search[dependency].dup
     end
@@ -328,10 +354,11 @@ module Pod
     # @return [Array<Specification>] List of specifications satisfying given requirements.
     #
     def specifications_for_dependency(dependency, additional_requirements = [])
-      requirement = Requirement.new(dependency.requirement.as_list + additional_requirements.flat_map(&:as_list))
+      requirement_list = dependency.requirement.as_list + additional_requirements.flat_map(&:as_list)
+      requirement_list.uniq!
+      requirement = Requirement.new(requirement_list)
       find_cached_set(dependency).
-        all_specifications(warn_for_multiple_pod_sources).
-        select { |s| requirement.satisfied_by? s.version }.
+        all_specifications(warn_for_multiple_pod_sources, requirement).
         map { |s| s.subspec_by_name(dependency.name, false, true) }.
         compact
     end
@@ -392,7 +419,6 @@ module Pod
     # @return [Source::Aggregate] The aggregate of the {#sources}.
     #
     def aggregate_for_dependency(dependency)
-      sources_manager = Config.instance.sources_manager
       if dependency && dependency.podspec_repo
         sources_manager.aggregate_for_dependency(dependency)
       elsif (locked_vertex = @locked_dependencies.vertex_named(dependency.name)) && (locked_dependency = locked_vertex.payload) && locked_dependency.podspec_repo
@@ -414,7 +440,7 @@ module Pod
       unless spec.available_platforms.any? { |p| target_platform.to_sym == p.to_sym }
         raise Informative, "The platform of the target `#{target.name}` "     \
           "(#{target.platform}) is not compatible with `#{spec}`, which does "  \
-          "not support `#{target.platform.name}`."
+          "not support `#{target.platform.string_name}`."
       end
     end
 
@@ -427,6 +453,9 @@ module Pod
     def handle_resolver_error(error)
       message = error.message
       type = Informative
+      unless specs_updated?
+        specs_update_message = "\n * out-of-date source repos which you can update with `pod repo update` or with `pod install --repo-update`."
+      end
       case error
       when Molinillo::VersionConflict
         message = error.message_with_trees(
@@ -438,9 +467,9 @@ module Pod
             if local_pod_parent && !specifications_for_dependency(conflict.requirement).empty? && !conflict.possibility && conflict.locked_requirement
               # Conflict was caused by a requirement from a local dependency.
               # Tell user to use `pod update`.
-              o << "\nIt seems like you've changed the constraints of dependency `#{name}` " \
-              "inside your development pod `#{local_pod_parent.name}`.\nYou should run `pod update #{name}` to apply "\
-              "changes you've made."
+              o << "\n\nYou have either:#{specs_update_message}" \
+                   "\n * changed the constraints of dependency `#{name}` inside your development pod `#{local_pod_parent.name}`." \
+                   "\n   You should run `pod update #{name}` to apply changes you've made."
             elsif !conflict.possibility && conflict.locked_requirement && conflict.locked_requirement.external_source && conflict.locked_requirement.external_source[:podspec] &&
                                            conflict.requirement && conflict.requirement.external_source && conflict.requirement.external_source[:podspec]
               # The internal version of the Podspec doesn't match the external definition of a podspec
@@ -470,13 +499,9 @@ module Pod
                 dependencies = conflicts.count == 1 ? 'dependency' : 'dependencies'
                 o << "\nNone of your spec sources contain a spec satisfying "\
                   "the #{dependencies}: `#{conflicts.join(', ')}`." \
-                  "\n\nYou have either:"
-                unless specs_updated?
-                  o << "\n * out-of-date source repos which you can update with `pod repo update` or with `pod install --repo-update`."
-                end
-                o << "\n * mistyped the name or version." \
-                  "\n * not added the source repo that hosts the Podspec to your Podfile." \
-                  "\n\nNote: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by default."
+                  "\n\nYou have either:#{specs_update_message}" \
+                  "\n * mistyped the name or version." \
+                  "\n * not added the source repo that hosts the Podspec to your Podfile."
 
               else
                 o << "\nSpecs satisfying the `#{conflicts.join(', ')}` dependency were found, " \
@@ -489,12 +514,9 @@ module Pod
         message += <<-EOS
 
 
-You have either:
- * out-of-date source repos which you can update with `pod repo update` or with `pod install --repo-update`.
+You have either:#{specs_update_message}
  * mistyped the name or version.
  * not added the source repo that hosts the Podspec to your Podfile.
-
-Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by default.
         EOS
       end
       raise type.new(message).tap { |e| e.set_backtrace(error.backtrace) }
@@ -530,33 +552,21 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
       end
     end
 
-    # Returns the target-appropriate nodes that are `successors` of `node`,
-    # rejecting those that are scoped by target platform and have incompatible
-    # targets.
-    #
-    # @return [Array<Molinillo::DependencyGraph::Vertex>]
-    #         An array of target-appropriate nodes whose `payload`s are
-    #         dependencies for `target`.
-    #
-    def valid_dependencies_for_target(target)
-      dependencies = Set.new
-      @podfile_dependency_cache.target_definition_dependencies(target).each do |dep|
-        node = @activated.vertex_named(dep.name)
-        add_valid_dependencies_from_node(node, target, dependencies)
+    class EdgeAndPlatform
+      def initialize(edge, target_platform)
+        @edge = edge
+        @target_platform = target_platform
       end
-      dependencies
-    end
+      attr_reader :edge, :target_platform
 
-    def add_valid_dependencies_from_node(node, target, dependencies)
-      return unless dependencies.add?(node)
-      validate_platform(node.payload, target)
-      node.outgoing_edges.each do |edge|
-        next unless edge_is_valid_for_target_platform?(edge, target.platform)
-        add_valid_dependencies_from_node(edge.destination, target, dependencies)
+      def eql?(other)
+        edge.equal?(other.edge) && target_platform.eql?(other.target_platform)
       end
-    end
 
-    EdgeAndPlatform = Struct.new(:edge, :target_platform)
+      def hash
+        edge.object_id ^ target_platform.hash
+      end
+    end
     private_constant :EdgeAndPlatform
 
     # Whether the given `edge` should be followed to find dependencies for the