cocoapods 1.3.1 → 1.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e83803ec983d5bc4a42518425b64034d96de344f
-  data.tar.gz: 6c78bcd1978c3021744292dd48cb58f0c51ec732
+  metadata.gz: ccd89248d652b96a2bc808fb3ee21df39d3478f0
+  data.tar.gz: 54a96361eb879bb08e1a094032450fa33b84af37
 SHA512:
-  metadata.gz: e3eaf621edc09debfe41b0288617eac7f2d92ca81d38e1114b5bb76f66614a9f0f9f4388b9b8aa89425ae40f25f62639b3a492212ba882135144625dbd82efde
-  data.tar.gz: 79c8a4eb18d87eb1b300563366d72e96d7510785e55d9f857b79863637b31e8a82dc6c161250bdaa2f38caf1410322f74864e3efa9a5c68014dd04b9f314f66c
+  metadata.gz: 51657c926930d550992f2463cc1c26b679b8fefb6daaa86e7c83988eb6967ab43792b7c10fe39f58068e205639b6e628d12541094953aee91e9e0adf1290ffd9
+  data.tar.gz: e52fe2eb2101c6bdbadd571a77bc6b845b1992b923c5c9ed2a5380990ad94994c4f95d039eda866a3df15ef2045ca49e13e723cbdf47d91534e6994a56beedf6

data/CHANGELOG.md

@@ -4,6 +4,101 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.4.0.beta.1 (2017-09-24)
+
+##### Enhancements
+
+* Do not force include the master spec repo if plugins provide sources  
+  [Eric Amorde](https://github.com/amorde)
+  [#7033](https://github.com/CocoaPods/CocoaPods/pull/7033)
+
+* Add custom shell script integration from Podfile  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6820](https://github.com/CocoaPods/CocoaPods/pull/6820)
+
+* Show full requirement trees when a version conflict is encountered during 
+  dependency resolution.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Add support for source static library frameworks  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#6811](https://github.com/CocoaPods/CocoaPods/pull/6811)
+
+* Add Private Header support to static frameworks  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#6969](https://github.com/CocoaPods/CocoaPods/pull/6969)
+
+* For source static frameworks, include frameworks from dependent targets and libraries in OTHER_LDFLAGS  
+  [paulb777](https://github.com/paulb777)
+  [#6988](https://github.com/CocoaPods/CocoaPods/pull/6988)
+
+##### Bug Fixes
+
+* Deduplicate test specs correctly from pod variants and targets  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7036](https://github.com/CocoaPods/CocoaPods/pull/7036)
+
+* Do not merge `pod_target_xcconfig` from test specs into non test xcconfigs  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7037](https://github.com/CocoaPods/CocoaPods/pull/7037)
+
+* Wrap `$PODS_CONFIGURATION_BUILD_DIR` and `$PODS_BUILD_DIR` with curlies  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7048](https://github.com/CocoaPods/CocoaPods/pull/7048)
+
+* Fix common paths sometimes calculating incorrectly  
+  [amorde](https://github.com/amorde)
+  [#7028](https://github.com/CocoaPods/CocoaPods/pull/7028)
+
+* Do not code sign OSX targets for testing bundles  
+  [Justin Martin](https://github.com/justinseanmartin)
+  [#7027](https://github.com/CocoaPods/CocoaPods/pull/7027)
+
+* Ensure a unique ID is generated for each resource bundle  
+  [Justin Martin](https://github.com/justinseanmartin)
+  [#7015](https://github.com/CocoaPods/CocoaPods/pull/7015)
+
+* Do not include settings from file accessors of test specs into aggregate xcconfigs  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7019](https://github.com/CocoaPods/CocoaPods/pull/7019)
+
+* Use the resolver to identify which pod targets are test only  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [Justin Martin](https://github.com/justinseanmartin)
+  [#7014](https://github.com/CocoaPods/CocoaPods/pull/7014)
+
+* Perform code signing on xctest bundles in the Pods project generated by a test spec  
+  [Justin Martin](https://github.com/justinseanmartin)
+  [#7013](https://github.com/CocoaPods/CocoaPods/pull/7013)
+
+* Exclude test resource and framework paths from aggregate targets  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7000](https://github.com/CocoaPods/CocoaPods/pull/7000)
+
+* Wrap platform warning message with quotes  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6968](https://github.com/CocoaPods/CocoaPods/pull/6968)
+
+* Wire dependencies for pod targets not part of any aggregate target  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6948](https://github.com/CocoaPods/CocoaPods/pull/6948)
+
+* Fix validation warnings when using --swift-version  
+  [Danielle Tomlinson](https://github.com/dantoml)
+  [#6971](https://github.com/CocoaPods/CocoaPods/issue/6971)
+
+* Fix xcconfig boolean merging when substrings include yes or no  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#6997](https://github.com/CocoaPods/CocoaPods/pull/6997)
+
+* Filter out subset dependent targets from FRAMEWORK_SEARCH_PATHS  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7002](https://github.com/CocoaPods/CocoaPods/pull/7002)
+
+* Propagate HEADER_SEARCH_PATHS settings from search paths  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7006](https://github.com/CocoaPods/CocoaPods/pull/7006)
+
 ## 1.3.1 (2017-08-02)
 
 ##### Enhancements
@@ -98,7 +193,6 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 ## 1.3.0.beta.2 (2017-06-22)
 
 ##### Enhancements
-
 * Add inputs and outputs for resources script phase  
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#6806](https://github.com/CocoaPods/CocoaPods/pull/6806)

data/LICENSE

@@ -1,6 +1,6 @@
 This project is licensed under the MIT license.
 
-Copyright (c) 2011 - 2015 Eloy Durán <eloy.de.enige@gmail.com>,
+Copyright (c) 2011 - 2017 Eloy Durán <eloy.de.enige@gmail.com>,
                           Fabio Pelosin <fabiopelosin@gmail.com>,
                           Samuel Giddins <segiddins@segiddins.me>,
                           Marius Rackwitz <git@mariusrackwitz.de>,

data/README.md

@@ -71,7 +71,7 @@ CocoaPods is composed of the following projects:
 | Status | Project | Description | Info |
 | :----- | :------ | :--- | :--- |
 | [![Build Status](http://img.shields.io/travis/CocoaPods/CocoaPods/master.svg?style=flat)](http://travis-ci.org/CocoaPods/CocoaPods) | [CocoaPods](https://github.com/CocoaPods/CocoaPods) | The CocoaPods command line tool. | [guides](https://guides.cocoapods.org)
-| [![Build Status](http://img.shields.io/travis/CocoaPods/Core/master.svg?style=flat)](http://travis-ci.org/CocoaPods/Core) | [CocoaPods Core](https://github.com/CocoaPods/Core) | Support for working with specifications and podfiles. | [docs](http://docs.cocoapods.org/cocoapods_core)
+| [![Build Status](http://img.shields.io/travis/CocoaPods/Core/master.svg?style=flat)](http://travis-ci.org/CocoaPods/Core) | [CocoaPods Core](https://github.com/CocoaPods/Core) | Support for working with specifications and podfiles. | [docs](https://guides.cocoapods.org/contributing/components.html)
 | [![Build Status](http://img.shields.io/travis/CocoaPods/cocoapods-downloader/master.svg?style=flat)](http://travis-ci.org/CocoaPods/cocoapods-downloader) |[CocoaPods Downloader](https://github.com/CocoaPods/cocoapods-downloader) |  Downloaders for various source types. |  [docs](http://docs.cocoapods.org/cocoapods_downloader/index.html)
 | [![Build Status](http://img.shields.io/travis/CocoaPods/Xcodeproj/master.svg?style=flat)](https://travis-ci.org/CocoaPods/Xcodeproj) | [Xcodeproj](https://github.com/CocoaPods/Xcodeproj) | Create and modify Xcode projects from Ruby. |  [docs](http://docs.cocoapods.org/xcodeproj/index.html)
 | [![Build Status](http://img.shields.io/travis/CocoaPods/CLAide/master.svg?style=flat)](https://travis-ci.org/CocoaPods/CLAide) | [CLAide](https://github.com/CocoaPods/CLAide) | A small command-line interface framework.  | [docs](http://docs.cocoapods.org/claide/index.html)

data/lib/cocoapods/gem_version.rb

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

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

@@ -170,12 +170,15 @@ module Pod
         #  - `@import …;` / `import …`
         #
         def generate_settings_to_import_pod_targets
-          @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, 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.settings_for_dependent_targets(nil, search_paths_target.pod_targets)
+            @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
 
@@ -218,7 +221,7 @@ module Pod
           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 }
+            values_are_bools = uniq_values.all? { |v| v =~ /^(yes|no)$/i }
             if values_are_bools
               # Boolean build settings
               if uniq_values.count > 1

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

@@ -66,14 +66,14 @@ module Pod
 
           XCConfigHelper.add_settings_for_file_accessors_of_target(nil, target, @xcconfig)
           target.file_accessors.each do |file_accessor|
-            @xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig)
+            @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.settings_for_dependent_targets(target, recursive_dependent_targets, @test_xcconfig)
+          @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, recursive_dependent_targets, @test_xcconfig)
           if @test_xcconfig
             test_dependent_targets = [target, *target.recursive_test_dependent_targets].uniq
-            @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, test_dependent_targets - recursive_dependent_targets, @test_xcconfig)
+            @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_test_dependent_targets, @xcconfig)
             XCConfigHelper.generate_other_ld_flags(nil, target.all_test_dependent_targets, @xcconfig)
             XCConfigHelper.generate_ld_runpath_search_paths(target, false, true, @xcconfig)

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

@@ -11,7 +11,7 @@ module Pod
         #         this variable to point to the standard directory, which
         #         will be used by CocoaPods.
         #
-        BUILD_DIR_VARIABLE = '$PODS_BUILD_DIR'.freeze
+        BUILD_DIR_VARIABLE = '${PODS_BUILD_DIR}'.freeze
 
         # @return [String] Used as alias for CONFIGURATION_BUILD_DIR, so that
         #         when this is overridden per {PodTarget}, it is still possible
@@ -20,7 +20,7 @@ module Pod
         #         the user can override this variable to point to the standard
         #         directory, which will be used by CocoaPods.
         #
-        CONFIGURATION_BUILD_DIR_VARIABLE = '$PODS_CONFIGURATION_BUILD_DIR'.freeze
+        CONFIGURATION_BUILD_DIR_VARIABLE = '${PODS_CONFIGURATION_BUILD_DIR}'.freeze
 
         # Converts an array of strings to a single string where the each string
         # is surrounded by double quotes and separated by a space. Used to
@@ -76,13 +76,15 @@ module Pod
         #
         def self.add_settings_for_file_accessors_of_target(aggregate_target, pod_target, xcconfig)
           pod_target.file_accessors.each do |file_accessor|
-            XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, xcconfig)
-            XCConfigHelper.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, file_accessor)
+            if aggregate_target.nil? || !file_accessor.spec.test_specification?
+              XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, xcconfig)
+              XCConfigHelper.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, file_accessor)
+            end
           end
-          XCConfigHelper.add_dynamic_dependency_build_settings(pod_target, xcconfig)
+          XCConfigHelper.add_dynamic_dependency_build_settings(aggregate_target, pod_target, xcconfig)
           if pod_target.requires_frameworks?
             pod_target.dependent_targets.each do |dependent_target|
-              XCConfigHelper.add_dynamic_dependency_build_settings(dependent_target, xcconfig)
+              XCConfigHelper.add_dynamic_dependency_build_settings(aggregate_target, dependent_target, xcconfig)
             end
           end
         end
@@ -104,13 +106,15 @@ module Pod
         # @return [void]
         #
         def self.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, file_accessor)
-          file_accessor.vendored_static_frameworks.each do |vendored_static_framework|
-            adds_other_ldflags = XCConfigHelper.links_dependency?(aggregate_target, pod_target)
-            XCConfigHelper.add_framework_build_settings(vendored_static_framework, xcconfig, pod_target.sandbox.root, adds_other_ldflags)
-          end
-          file_accessor.vendored_static_libraries.each do |vendored_static_library|
-            adds_other_ldflags = XCConfigHelper.links_dependency?(aggregate_target, pod_target)
-            XCConfigHelper.add_library_build_settings(vendored_static_library, xcconfig, pod_target.sandbox.root, adds_other_ldflags)
+          if aggregate_target.nil? || !file_accessor.spec.test_specification?
+            file_accessor.vendored_static_frameworks.each do |vendored_static_framework|
+              adds_other_ldflags = XCConfigHelper.links_dependency?(aggregate_target, pod_target)
+              XCConfigHelper.add_framework_build_settings(vendored_static_framework, xcconfig, pod_target.sandbox.root, adds_other_ldflags)
+            end
+            file_accessor.vendored_static_libraries.each do |vendored_static_library|
+              adds_other_ldflags = XCConfigHelper.links_dependency?(aggregate_target, pod_target)
+              XCConfigHelper.add_library_build_settings(vendored_static_library, xcconfig, pod_target.sandbox.root, adds_other_ldflags)
+            end
           end
         end
 
@@ -132,6 +136,9 @@ module Pod
 
         # Adds build settings for dynamic vendored frameworks and libraries.
         #
+        # @param  [AggregateTarget] aggregate_target
+        #         The aggregate target, may be nil.
+        #
         # @param [PodTarget] pod_target
         #        The pod target, which holds the list of +Spec::FileAccessor+.
         #
@@ -140,13 +147,15 @@ module Pod
         #
         # @return [void]
         #
-        def self.add_dynamic_dependency_build_settings(pod_target, xcconfig)
+        def self.add_dynamic_dependency_build_settings(aggregate_target, pod_target, xcconfig)
           pod_target.file_accessors.each do |file_accessor|
-            file_accessor.vendored_dynamic_frameworks.each do |vendored_dynamic_framework|
-              XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, pod_target.sandbox.root)
-            end
-            file_accessor.vendored_dynamic_libraries.each do |vendored_dynamic_library|
-              XCConfigHelper.add_library_build_settings(vendored_dynamic_library, xcconfig, pod_target.sandbox.root)
+            if aggregate_target.nil? || !file_accessor.spec.test_specification?
+              file_accessor.vendored_dynamic_frameworks.each do |vendored_dynamic_framework|
+                XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, pod_target.sandbox.root)
+              end
+              file_accessor.vendored_dynamic_libraries.each do |vendored_dynamic_library|
+                XCConfigHelper.add_library_build_settings(vendored_dynamic_library, xcconfig, pod_target.sandbox.root)
+              end
             end
           end
         end
@@ -270,14 +279,25 @@ module Pod
         #
         # @return [Hash<String, String>] the settings
         #
-        def self.settings_for_dependent_targets(target, dependent_targets, test_xcconfig = false)
+        def self.search_paths_for_dependent_targets(target, dependent_targets, test_xcconfig = false)
           dependent_targets = dependent_targets.select(&:should_build?)
 
+          # Filter out dependent targets that are subsets of another target.
+          subset_targets = []
+          dependent_targets.combination(2) do |a, b|
+            if (a.specs - b.specs).empty?
+              subset_targets << a
+            elsif (b.specs - a.specs).empty?
+              subset_targets << b
+            end
+          end
+          dependent_targets -= subset_targets
+
           # Alias build dirs to avoid recursive definitions for pod targets and depending
           # on build settings which could be overwritten in the user target.
           build_settings = {
-            BUILD_DIR_VARIABLE[1..-1] => '$BUILD_DIR',
-            CONFIGURATION_BUILD_DIR_VARIABLE[1..-1] => "#{BUILD_DIR_VARIABLE}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)",
+            BUILD_DIR_VARIABLE[2..-2] => '${BUILD_DIR}',
+            CONFIGURATION_BUILD_DIR_VARIABLE[2..-2] => "#{BUILD_DIR_VARIABLE}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)",
           }
 
           # Scope pod targets as long as they are not test targets.
@@ -301,6 +321,32 @@ module Pod
           build_settings
         end
 
+        # Updates xcconfig with the HEADER_SEARCH_PATHS from the search_paths.
+        #
+        # @param  [Target] search_paths_target
+        #         The target.
+        #
+        # @param  [Xcodeproj::Config] xcconfig
+        #         The xcconfig to edit.
+        #
+        def self.propagate_header_search_paths_from_search_paths(search_paths_target, xcconfig)
+          header_search_paths_list = []
+          search_paths_target.pod_targets.each do |target|
+            target.spec_consumers.each do |spec_consumer|
+              paths = spec_consumer.user_target_xcconfig['HEADER_SEARCH_PATHS']
+              header_search_paths_list <<= paths unless paths.nil?
+            end
+            unless header_search_paths_list == []
+              header_search_paths = header_search_paths_list.join(' ')
+              unless header_search_paths.include? '$(inherited)'
+                header_search_paths = '$(inherited) ' + header_search_paths
+              end
+              build_settings = { 'HEADER_SEARCH_PATHS' => header_search_paths }
+              xcconfig.merge!(build_settings)
+            end
+          end
+        end
+
         # Add custom build settings and required build settings to link to
         # vendored libraries and frameworks.
         #
@@ -321,7 +367,7 @@ module Pod
         #
         def self.generate_vendored_build_settings(aggregate_target, pod_targets, xcconfig)
           pod_targets.each do |pod_target|
-            unless pod_target.should_build? && pod_target.requires_frameworks?
+            unless pod_target.should_build? && pod_target.requires_frameworks? && !pod_target.static_framework?
               XCConfigHelper.add_settings_for_file_accessors_of_target(aggregate_target, pod_target, xcconfig)
             end
           end
@@ -385,6 +431,16 @@ module Pod
         # @return [void]
         #
         def self.generate_other_ld_flags(aggregate_target, pod_targets, xcconfig)
+          # Make sure -framework option gets added for the search paths when static_frameworks are involved.
+          # Otherwise test targets won't link in their primary target's dependencies.
+          unless aggregate_target.nil?
+            dependent_targets = aggregate_target.search_paths_aggregate_targets
+            dependent_targets.each do |dependent_target|
+              if dependent_target.pod_targets.any?(&:static_framework?)
+                generate_other_ld_flags(dependent_target, dependent_target.pod_targets, xcconfig)
+              end
+            end
+          end
           other_ld_flags = pod_targets.select(&:should_build?).map do |pod_target|
             if pod_target.requires_frameworks?
               %(-framework "#{pod_target.product_basename}")

data/lib/cocoapods/installer.rb

@@ -140,11 +140,11 @@ module Pod
       end
     end
 
+    # @return [Analyzer] The analyzer used to resolve dependencies
+    #
     def resolve_dependencies
-      analyzer = create_analyzer
-
       plugin_sources = run_source_provider_hooks
-      analyzer.sources.insert(0, *plugin_sources)
+      analyzer = create_analyzer(plugin_sources)
 
       UI.section 'Updating local specs repositories' do
         analyzer.update_repositories
@@ -155,6 +155,7 @@ module Pod
         validate_build_configurations
         clean_sandbox
       end
+      analyzer
     end
 
     def download_dependencies
@@ -243,8 +244,8 @@ module Pod
       @aggregate_targets = analyzer.result.targets
     end
 
-    def create_analyzer
-      Analyzer.new(sandbox, podfile, lockfile).tap do |analyzer|
+    def create_analyzer(plugin_sources = nil)
+      Analyzer.new(sandbox, podfile, lockfile, plugin_sources).tap do |analyzer|
         analyzer.installation_options = installation_options
         analyzer.has_dependencies = has_dependencies?
       end

data/lib/cocoapods/installer/analyzer.rb

@@ -32,16 +32,22 @@ module Pod
       #
       attr_reader :lockfile
 
+      # @return [Array<Source>] Sources provided by plugins
+      #
+      attr_reader :plugin_sources
+
       # Initialize a new instance
       #
-      # @param  [Sandbox]  sandbox     @see sandbox
-      # @param  [Podfile]  podfile     @see podfile
-      # @param  [Lockfile] lockfile    @see lockfile
+      # @param  [Sandbox]       sandbox           @see sandbox
+      # @param  [Podfile]       podfile           @see podfile
+      # @param  [Lockfile]      lockfile          @see lockfile
+      # @param  [Array<Source>] plugin_sources    @see plugin_sources
       #
-      def initialize(sandbox, podfile, lockfile = nil)
+      def initialize(sandbox, podfile, lockfile = nil, plugin_sources = nil)
         @sandbox  = sandbox
         @podfile  = podfile
         @lockfile = lockfile
+        @plugin_sources = plugin_sources
 
         @update = false
         @allow_pre_downloads = true
@@ -75,11 +81,15 @@ module Pod
         store_existing_checkout_options
         fetch_external_sources if allow_fetches
 
-        @locked_dependencies    = generate_version_locking_dependencies
-        @result.specs_by_target = validate_platforms(resolve_dependencies)
-        @result.specifications  = generate_specifications
-        @result.targets         = generate_targets
+        @locked_dependencies = generate_version_locking_dependencies
+        resolver_specs_by_target = resolve_dependencies
+        validate_platforms(resolver_specs_by_target)
+        @result.specifications  = generate_specifications(resolver_specs_by_target)
+        @result.targets         = generate_targets(resolver_specs_by_target)
         @result.sandbox_state   = generate_sandbox_state
+        @result.specs_by_target = resolver_specs_by_target.each_with_object({}) do |rspecs_by_target, hash|
+          hash[rspecs_by_target[0]] = rspecs_by_target[1].map(&:spec)
+        end
         @result
       end
 
@@ -365,13 +375,17 @@ module Pod
 
       # Creates the models that represent the targets generated by CocoaPods.
       #
-      # @return [Array<AggregateTarget>]
+      # @param  [Hash{Podfile::TargetDefinition => Array<ResolvedSpecification>}] resolver_specs_by_target
+      #         mapping of targets to resolved specs (containing information about test usage)
+      #         aggregate targets
       #
-      def generate_targets
-        specs_by_target = result.specs_by_target.reject { |td, _| td.abstract? }
-        pod_targets = generate_pod_targets(specs_by_target)
-        aggregate_targets = specs_by_target.keys.map do |target_definition|
-          generate_target(target_definition, pod_targets)
+      # @return [Array<AggregateTarget>] the list of aggregate targets generated.
+      #
+      def generate_targets(resolver_specs_by_target)
+        resolver_specs_by_target = resolver_specs_by_target.reject { |td, _| td.abstract? }
+        pod_targets = generate_pod_targets(resolver_specs_by_target)
+        aggregate_targets = resolver_specs_by_target.keys.map do |target_definition|
+          generate_target(target_definition, pod_targets, resolver_specs_by_target)
         end
         if installation_options.integrate_targets?
           # Copy embedded target pods that cannot have their pods embedded as frameworks to
@@ -406,9 +420,12 @@ module Pod
       # @param  [Array<PodTarget>] pod_targets
       #         the pod targets, which were generated.
       #
+      # @param  [Hash{Podfile::TargetDefinition => Array<ResolvedSpecification>}] resolver_specs_by_target
+      #         the resolved specifications grouped by target.
+      #
       # @return [AggregateTarget]
       #
-      def generate_target(target_definition, pod_targets)
+      def generate_target(target_definition, pod_targets, resolver_specs_by_target)
         target = AggregateTarget.new(target_definition, sandbox)
         target.host_requires_frameworks |= target_definition.uses_frameworks?
 
@@ -429,7 +446,7 @@ module Pod
           end
         end
 
-        target.pod_targets = filter_pod_targets_for_target_definition(pod_targets, target_definition)
+        target.pod_targets = filter_pod_targets_for_target_definition(target_definition, pod_targets, resolver_specs_by_target)
 
         target
       end
@@ -437,97 +454,79 @@ module Pod
       # Returns a filtered list of pod targets that should or should not be part of the target definition. Pod targets
       # used by tests only are filtered.
       #
-      # @param [Array<PodTarget>] pod_targets
-      #        the array of pod targets to check against
-      #
       # @param [TargetDefinition] target_definition
       #        the target definition to use as the base for filtering
       #
-      # @return [Array<PodTarget>] the filtered list of pod targets.
-      #
-      def filter_pod_targets_for_target_definition(pod_targets, target_definition)
-        pod_targets.select do |pod_target|
-          pod_target.target_definitions.include?(target_definition) && !pod_target_test_only?(pod_target, pod_targets)
-        end
-      end
-
-      # Returns true if a pod target is only used by other pod targets as a test dependency and therefore should
-      # not be included as part of the aggregate target.
-      #
-      # @param [PodTarget] pod_target
-      #        the pod target being queried
-      #
       # @param [Array<PodTarget>] pod_targets
       #        the array of pod targets to check against
       #
-      # @return [Boolean] if the pod target is only referenced from test dependencies.
+      # @param  [Hash{Podfile::TargetDefinition => Array<ResolvedSpecification>}] resolver_specs_by_target
+      #         the resolved specifications grouped by target.
+      #
+      # @return [Array<PodTarget>] the filtered list of pod targets.
       #
-      def pod_target_test_only?(pod_target, pod_targets)
-        name = pod_target.name
-        key = @test_pod_target_key.new(name, pod_targets)
-        if @test_pod_target_analyzer_cache.key?(key)
-          return @test_pod_target_analyzer_cache[key]
-        end
-        source = pod_targets.any? do |pt|
-          pt.dependent_targets.map(&:name).include?(name)
-        end
-        test = pod_targets.any? do |pt|
-          pt.test_dependent_targets.reject { |dpt| dpt.name == pt.name }.map(&:name).include?(name)
+      def filter_pod_targets_for_target_definition(target_definition, pod_targets, resolver_specs_by_target)
+        pod_targets.select do |pod_target|
+          included_in_target_definition = pod_target.target_definitions.include?(target_definition)
+          used_by_tests_only = resolver_specs_by_target[target_definition].select { |resolver_spec| pod_target.specs.include?(resolver_spec.spec) }.all?(&:used_by_tests_only?)
+          included_in_target_definition && !used_by_tests_only
         end
-        @test_pod_target_analyzer_cache[key] = !source && test
       end
 
       # Setup the pod targets for an aggregate target. Deduplicates resulting
       # targets by grouping by platform and subspec by their root
       # to create a {PodTarget} for each spec.
       #
-      # @param  [Hash{Podfile::TargetDefinition => Array<Specification>}] specs_by_target
+      # @param  [Hash{Podfile::TargetDefinition => Array<ResolvedSpecification>}] resolver_specs_by_target
       #         the resolved specifications grouped by target.
       #
       # @return [Array<PodTarget>]
       #
-      def generate_pod_targets(specs_by_target)
+      def generate_pod_targets(resolver_specs_by_target)
         if installation_options.deduplicate_targets?
-          distinct_targets = specs_by_target.each_with_object({}) do |dependency, hash|
+          distinct_targets = resolver_specs_by_target.each_with_object({}) do |dependency, hash|
             target_definition, dependent_specs = *dependency
-            dependent_specs.group_by(&:root).each do |root_spec, specs|
-              pod_variant = PodVariant.new(specs, target_definition.platform, target_definition.uses_frameworks?)
+            dependent_specs.group_by(&:root).each do |root_spec, resolver_specs|
+              all_specs = resolver_specs.map(&:spec)
+              test_specs, specs = all_specs.partition(&:test_specification?)
+              pod_variant = PodVariant.new(specs, test_specs, target_definition.platform, target_definition.uses_frameworks?)
               hash[root_spec] ||= {}
               (hash[root_spec][pod_variant] ||= []) << target_definition
+              hash[root_spec].keys.find { |k| k == pod_variant }.test_specs.concat(test_specs).uniq!
             end
           end
 
           pod_targets = distinct_targets.flat_map do |_root, target_definitions_by_variant|
             suffixes = PodVariantSet.new(target_definitions_by_variant.keys).scope_suffixes
             target_definitions_by_variant.flat_map do |variant, target_definitions|
-              generate_pod_target(target_definitions, variant.specs, :scope_suffix => suffixes[variant])
+              generate_pod_target(target_definitions, variant.specs + variant.test_specs, :scope_suffix => suffixes[variant])
             end
           end
 
-          all_specs = specs_by_target.values.flatten.uniq
+          all_resolver_specs = resolver_specs_by_target.values.flatten.map(&:spec).uniq
           pod_targets_by_name = pod_targets.group_by(&:pod_name).each_with_object({}) do |(name, values), hash|
             # Sort the target by the number of activated subspecs, so that
             # we prefer a minimal target as transitive dependency.
             hash[name] = values.sort_by { |pt| pt.specs.count }
           end
           pod_targets.each do |target|
-            dependencies = transitive_dependencies_for_specs(target.specs.reject(&:test_specification?), target.platform, all_specs).group_by(&:root)
-            test_dependencies = transitive_dependencies_for_specs(target.specs.select(&:test_specification?), target.platform, all_specs).group_by(&:root)
+            dependencies = transitive_dependencies_for_specs(target.specs.reject(&:test_specification?), target.platform, all_resolver_specs).group_by(&:root)
+            test_dependencies = transitive_dependencies_for_specs(target.specs.select(&:test_specification?), target.platform, all_resolver_specs).group_by(&:root)
             test_dependencies.delete_if { |k| dependencies.key? k }
             target.dependent_targets = filter_dependencies(dependencies, pod_targets_by_name, target)
             target.test_dependent_targets = filter_dependencies(test_dependencies, pod_targets_by_name, target)
           end
         else
           dedupe_cache = {}
-          specs_by_target.flat_map do |target_definition, specs|
+          resolver_specs_by_target.flat_map do |target_definition, specs|
             grouped_specs = specs.group_by(&:root).values.uniq
             pod_targets = grouped_specs.flat_map do |pod_specs|
-              generate_pod_target([target_definition], pod_specs).scoped(dedupe_cache)
+              generate_pod_target([target_definition], pod_specs.map(&:spec)).scoped(dedupe_cache)
             end
 
             pod_targets.each do |target|
-              dependencies = transitive_dependencies_for_specs(target.specs, target.platform, specs).group_by(&:root)
-              test_dependencies = transitive_dependencies_for_specs(target.specs.select(&:test_specification?), target.platform, all_specs).group_by(&:root)
+              dependencies = transitive_dependencies_for_specs(target.specs.reject(&:test_specification?), target.platform, specs.map(&:spec)).group_by(&:root)
+              test_dependencies = transitive_dependencies_for_specs(target.specs.select(&:test_specification?), target.platform, specs.map(&:spec)).group_by(&:root)
               test_dependencies.delete_if { |k| dependencies.key? k }
               target.dependent_targets = pod_targets.reject { |t| dependencies[t.root_spec].nil? }
               target.test_dependent_targets = pod_targets.reject { |t| test_dependencies[t.root_spec].nil? }
@@ -764,27 +763,27 @@ module Pod
            "- #{dependencies.map(&:to_s).join("\n- ")}"
         end
 
-        specs_by_target = nil
+        resolver_specs_by_target = nil
         UI.section "Resolving dependencies of #{UI.path(podfile.defined_in_file) || 'Podfile'}" do
           resolver = Resolver.new(sandbox, podfile, locked_dependencies, sources)
           resolver.specs_updated = specs_updated?
-          specs_by_target = resolver.resolve
-          specs_by_target.values.flatten(1).each(&:validate_cocoapods_version)
+          resolver_specs_by_target = resolver.resolve
+          resolver_specs_by_target.values.flatten(1).map(&:spec).each(&:validate_cocoapods_version)
         end
-        specs_by_target
+        resolver_specs_by_target
       end
 
       # Warns for any specification that is incompatible with its target.
       #
-      # @param  [Hash{TargetDefinition => Array<Spec>}] specs_by_target
+      # @param  [Hash{TargetDefinition => Array<Spec>}] resolver_specs_by_target
       #         the specifications grouped by target.
       #
       # @return [Hash{TargetDefinition => Array<Spec>}] the specifications
       #         grouped by target.
       #
-      def validate_platforms(specs_by_target)
-        specs_by_target.each do |target, specs|
-          specs.each do |spec|
+      def validate_platforms(resolver_specs_by_target)
+        resolver_specs_by_target.each do |target, specs|
+          specs.map(&:spec).each do |spec|
             next unless target_platform = target.platform
             unless spec.available_platforms.any? { |p| target_platform.supports?(p) }
               UI.warn "The platform of the target `#{target.name}` "     \
@@ -795,12 +794,12 @@ module Pod
         end
       end
 
-      # Returns the list of all the resolved the resolved specifications.
+      # Returns the list of all the resolved specifications.
       #
       # @return [Array<Specification>] the list of the specifications.
       #
-      def generate_specifications
-        result.specs_by_target.values.flatten.uniq
+      def generate_specifications(resolver_specs_by_target)
+        resolver_specs_by_target.values.flatten.map(&:spec).uniq
       end
 
       # Computes the state of the sandbox respect to the resolved
@@ -835,8 +834,8 @@ module Pod
 
       # Returns the sources used to query for specifications
       #
-      # When no explicit Podfile sources are defined, this defaults to the
-      # master spec repository.
+      # When no explicit Podfile sources or plugin sources are defined, this
+      # defaults to the master spec repository.
       # available sources ({config.sources_manager.all}).
       #
       # @return [Array<Source>] the sources to be used in finding
@@ -845,6 +844,7 @@ module Pod
       def sources
         @sources ||= begin
           sources = podfile.sources
+          plugin_sources = @plugin_sources || []
 
           # Add any sources specified using the :source flag on individual dependencies.
           dependency_sources = podfile.dependencies.map(&:podspec_repo).compact
@@ -852,15 +852,19 @@ module Pod
 
           if all_dependencies_have_sources
             sources = dependency_sources
-          elsif has_dependencies? && sources.empty?
+          elsif has_dependencies? && sources.empty? && plugin_sources.empty?
             sources = ['https://github.com/CocoaPods/Specs.git']
           else
             sources += dependency_sources
           end
 
-          sources.uniq.map do |source_url|
+          result = sources.uniq.map do |source_url|
             config.sources_manager.find_or_create_source_with_url(source_url)
           end
+          unless plugin_sources.empty?
+            result.insert(0, *plugin_sources)
+          end
+          result
         end
       end