cocoapods 0.20.2 → 0.21.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4046f40b104b268eb0dcc90991f868953707d6c4
+  data.tar.gz: 006fd40b93468988e5cca4c9388e9e00a1b7ca02
+SHA512:
+  metadata.gz: 6fa144dd19952870b080632f055abb1111dfcdf26e37ba5b16d2f602b77bd56766cb7cf5ed50e2613a299ffd778ddec3b52a3f221d416122e38897f68828c31d
+  data.tar.gz: 86cfacba4348f91b159e486984b00bdb04493db61ec5bccf50a1a1b8358666a0942c9a3bf0b7212836a2670300c35bc0ea06ef0e192163268a4a3b4431b36fef

data/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+
+## 0.21.0.rc1
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.20.2...0.21.0.rc1)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.20.2...0.21.0.rc1)
+• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.6.0...0.7.0)
+
+###### Enhancements
+
+* Pods are now built in dedicated targets. This enhancement isolates the build
+  environment of each Pod from other ones eliminating pollution issues. It also
+  introduces an important architectural improvement which lays the foundation
+  for the upcoming CocoaPods features. Stay tuned! This feature has been
+  implemented by [Jeremy Slater](https://github.com/jasl8r).
+  [#841](https://github.com/CocoaPods/CocoaPods/issues/1080)
+
+* Reduced external dependencies and deprecation of Rake::FileList.
+  [#1080](https://github.com/CocoaPods/CocoaPods/issues/1080)
+
+###### Bug fixes
+
+* Fixed crash due to Podfile.lock containing multiple version requirements for
+  a Pod. [#1076](https://github.com/CocoaPods/CocoaPods/issues/1076)
+* Fixed a build error due to the copy resources script using the same temporary
+  file for multiple targets.
+  [#1099](https://github.com/CocoaPods/CocoaPods/issues/1099)
+
 ## 0.20.2
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.20.1...0.20.2)
 

data/lib/cocoapods.rb

@@ -7,7 +7,6 @@ module Pod
 
   require 'cocoapods/gem_version'
   require 'cocoapods-core'
-  require 'cocoapods/file_list'
   require 'cocoapods/config'
   require 'cocoapods/downloader'
 
@@ -43,7 +42,9 @@ module Pod
   autoload :ExternalSources,           'cocoapods/external_sources'
   autoload :Installer,                 'cocoapods/installer'
   autoload :SourcesManager,            'cocoapods/sources_manager'
-  autoload :Library,                   'cocoapods/library'
+  autoload :Target,                    'cocoapods/target'
+  autoload :AggregateTarget,           'cocoapods/target/aggregate_target'
+  autoload :PodTarget,                 'cocoapods/target/pod_target'
   autoload :Project,                   'cocoapods/project'
   autoload :Resolver,                  'cocoapods/resolver'
   autoload :Sandbox,                   'cocoapods/sandbox'
@@ -52,14 +53,17 @@ module Pod
 
   module Generator
     autoload :Acknowledgements,        'cocoapods/generator/acknowledgements'
+    autoload :Markdown,                'cocoapods/generator/acknowledgements/markdown'
+    autoload :Plist,                   'cocoapods/generator/acknowledgements/plist'
     autoload :BridgeSupport,           'cocoapods/generator/bridge_support'
     autoload :CopyResourcesScript,     'cocoapods/generator/copy_resources_script'
     autoload :DummySource,             'cocoapods/generator/dummy_source'
-    autoload :Markdown,                'cocoapods/generator/acknowledgements/markdown'
-    autoload :Plist,                   'cocoapods/generator/acknowledgements/plist'
     autoload :PrefixHeader,            'cocoapods/generator/prefix_header'
     autoload :TargetEnvironmentHeader, 'cocoapods/generator/target_environment_header'
     autoload :XCConfig,                'cocoapods/generator/xcconfig'
+    autoload :AggregateXCConfig,       'cocoapods/generator/xcconfig/aggregate_xcconfig'
+    autoload :PublicPodXCConfig,       'cocoapods/generator/xcconfig/public_pod_xcconfig'
+    autoload :PrivatePodXCConfig,      'cocoapods/generator/xcconfig/private_pod_xcconfig'
   end
 
   module Hooks

data/lib/cocoapods/command/spec.rb

@@ -32,15 +32,6 @@ module Pod
 
         def run
           if repo_id_match = (@url || @name_or_url).match(/github.com\/([^\/\.]*\/[^\/\.]*)\.*/)
-            # This is to make sure Faraday doesn't warn the user about the `system_timer` gem missing.
-            old_warn, $-w = $-w, nil
-            begin
-              require 'faraday'
-            ensure
-              $-w = old_warn
-            end
-            require 'octokit'
-
             repo_id = repo_id_match[1]
             data = github_data_for_template(repo_id)
             data[:name] = @name_or_url if @url
@@ -410,8 +401,8 @@ module Pod
       end
 
       def github_data_for_template(repo_id)
-        repo = Octokit.repo(repo_id)
-        user = Octokit.user(repo['owner']['login'])
+        repo = GitHub.repo(repo_id)
+        user = GitHub.user(repo['owner']['login'])
         data = {}
 
         data[:name]          = repo['name']
@@ -425,7 +416,7 @@ module Pod
       end
 
       def suggested_ref_and_version(repo)
-        tags = Octokit.tags(:username => repo['owner']['login'], :repo => repo['name']).map {|tag| tag["name"]}
+        tags = GitHub.tags(repo['html_url']).map {|tag| tag["name"]}
         versions_tags = {}
         tags.each do |tag|
           clean_tag = tag.gsub(/^v(er)? ?/,'')
@@ -434,9 +425,9 @@ module Pod
         version = versions_tags.keys.sort.last || '0.0.1'
         data = {:version => version}
         if version == '0.0.1'
-          branches        = Octokit.branches(:username => repo['owner']['login'], :repo => repo['name'])
+          branches        = GitHub.branches(repo['html_url'])
           master_name     = repo['master_branch'] || 'master'
-          master          = branches.select {|branch| branch['name'] == master_name }.first
+          master          = branches.find {|branch| branch['name'] == master_name }
           data[:ref_type] = ':commit'
           data[:ref]      = master['commit']['sha']
         else

data/lib/cocoapods/gem_version.rb

@@ -1,6 +1,6 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.20.2' unless defined? Pod::VERSION
+  VERSION = '0.21.0.rc1' unless defined? Pod::VERSION
 end
 

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -80,8 +80,8 @@ module Pod
       INSTALL_RESOURCES_FUCTION = <<EOS
 #!/bin/sh
 
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
-touch "$RESOURCES_TO_COPY"
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
+> "$RESOURCES_TO_COPY"
 
 install_resource()
 {

data/lib/cocoapods/generator/xcconfig.rb

@@ -1,85 +1,28 @@
 module Pod
   module Generator
 
-    # Generates an xcconfig file for each target of the Pods project. The
-    # configuration file should be used by the user target as well.
+    # Generates Xcode configuration files. A configuration file is generated
+    # for each Pod and for each Pod target definition. The aggregates the
+    # configurations of the Pods and define target specific settings.
     #
     class XCConfig
 
-      # @return [Sandbox] the sandbox where the Pods project is installed.
+      # @return [Target] the target represented by this xcconfig.
       #
+      attr_reader :target
       attr_reader :sandbox
 
-      # @return [Array<Specification::Consumer>] the consumers for the
-      #         specifications of the library which needs the xcconfig.
+      # @param  [Target] target @see target
       #
-      attr_reader :spec_consumers
-
-      # @return [String] the relative path of the Pods root respect the user
-      #         project that should be integrated by this library.
-      #
-      attr_reader :relative_pods_root
-
-      # @param  [Sandbox] sandbox @see sandbox
-      # @param  [Array<LocalPod>] pods @see pods
-      # @param  [String] relative_pods_root @see relative_pods_root
-      #
-      def initialize(sandbox, spec_consumers, relative_pods_root)
-        @sandbox = sandbox
-        @spec_consumers = spec_consumers
-        @relative_pods_root = relative_pods_root
-      end
-
-      # @return [Bool] whether the Podfile specifies to add the `-fobjc-arc`
-      #         flag for compatibility.
-      #
-      attr_accessor :set_arc_compatibility_flag
-
-      #-----------------------------------------------------------------------#
-
-      # Generates the xcconfig for the library.
-      #
-      # @return [Xcodeproj::Config]
-      #
-      # @note   The value `PODS_HEADERS_SEARCH_PATHS` is used to store the headers
-      #         so xcconfig can reference the variable.
-      #
-      def generate
-        ld_flags = '-ObjC'
-        if  set_arc_compatibility_flag && spec_consumers.any? { |consumer| consumer.requires_arc }
-          ld_flags << ' -fobjc-arc'
-        end
-
-        @xcconfig = Xcodeproj::Config.new({
-          'ALWAYS_SEARCH_USER_PATHS'         => 'YES',
-          'OTHER_LDFLAGS'                    => ld_flags,
-          'HEADER_SEARCH_PATHS'              => '${PODS_HEADERS_SEARCH_PATHS}',
-          'PODS_ROOT'                        => relative_pods_root,
-          'PODS_HEADERS_SEARCH_PATHS'        => '${PODS_PUBLIC_HEADERS_SEARCH_PATHS}',
-          'PODS_BUILD_HEADERS_SEARCH_PATHS'  => quote(sandbox.build_headers.search_paths),
-          'PODS_PUBLIC_HEADERS_SEARCH_PATHS' => quote(sandbox.public_headers.search_paths),
-          'GCC_PREPROCESSOR_DEFINITIONS'     => '$(inherited) COCOAPODS=1'
-        })
-
-        spec_consumers.each do |consumer|
-          add_spec_build_settings_to_xcconfig(consumer, @xcconfig)
-        end
-
-        @xcconfig
+      def initialize(target)
+        @target = target
+        @sandbox = target.sandbox
       end
 
       # @return [Xcodeproj::Config] The generated xcconfig.
       #
       attr_reader :xcconfig
 
-      # @return [Hash] The settings of the xcconfig that the Pods project
-      #         needs to override.
-      #
-      def self.pods_project_settings
-        { 'PODS_ROOT' => '${SRCROOT}',
-          'PODS_HEADERS_SEARCH_PATHS' => '${PODS_BUILD_HEADERS_SEARCH_PATHS}' }
-      end
-
       # Generates and saves the xcconfig to the given path.
       #
       # @param  [Pathname] path
@@ -88,7 +31,7 @@ module Pod
       # @return [void]
       #
       def save_as(path)
-        path.open('w') { |file| file.write(generate) }
+        generate.save_as(path)
       end
 
       #-----------------------------------------------------------------------#
@@ -102,12 +45,12 @@ module Pod
       #         Podfile.
       #
       def default_ld_flags
-        flags = %w[ -ObjC ]
-        requires_arc = pods.any? { |pod| pod.requires_arc? }
-        if  requires_arc && set_arc_compatibility_flag
-          flags << '-fobjc-arc'
+        ld_flags = '-ObjC'
+        if target.target_definition.podfile.set_arc_compatibility_flag? and
+           target.spec_consumers.any? { |consumer| consumer.requires_arc? }
+          ld_flags << ' -fobjc-arc'
         end
-        flags.join(" ")
+        ld_flags
       end
 
       # Converts an array of strings to a single string where the each string
@@ -132,8 +75,6 @@ module Pod
       # @param  [Xcodeproj::Config] xcconfig
       #         The xcconfig to edit.
       #
-      # @return [void]
-      #
       def add_spec_build_settings_to_xcconfig(consumer, xcconfig)
         xcconfig.merge!(consumer.xcconfig)
         xcconfig.libraries.merge(consumer.libraries)
@@ -153,7 +94,7 @@ module Pod
       ]
 
       # Adds the search paths of the developer frameworks to the specification
-      # if needed. This is done because the `SenTestingKit` requires them and 
+      # if needed. This is done because the `SenTestingKit` requires them and
       # adding them to each specification which requires it is repetitive and
       # error prone.
       #

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

@@ -0,0 +1,47 @@
+module Pod
+  module Generator
+
+    # Generates the xcconfigs for the aggregate targets.
+    #
+    class AggregateXCConfig < XCConfig
+
+      # Generates the xcconfig.
+      #
+      # @note   The xcconfig file for a Pods integration target includes the
+      #         namespaced xcconfig files for each spec target dependency.
+      #         Each namespaced configuration value is merged into the Pod
+      #         xcconfig file.
+      #
+      # @return [Xcodeproj::Config]
+      #
+      def generate
+        config = {
+          'ALWAYS_SEARCH_USER_PATHS'         => 'YES',
+          'OTHER_LDFLAGS'                    => default_ld_flags,
+          'HEADER_SEARCH_PATHS'              => quote(sandbox.public_headers.search_paths),
+          'PODS_ROOT'                        => target.relative_pods_root,
+          'GCC_PREPROCESSOR_DEFINITIONS'     => '$(inherited) COCOAPODS=1',
+        }
+
+        target.pod_targets.each do |pod_target|
+          xcconfig = Xcodeproj::Config.new
+          pod_target.spec_consumers.each do |consumer|
+            add_spec_build_settings_to_xcconfig(consumer, xcconfig)
+          end
+
+          xcconfig.to_hash.each do |k, v|
+            prefixed_key = pod_target.xcconfig_prefix + k
+            config[k] = "#{config[k]} ${#{prefixed_key}}"
+          end
+        end
+
+        @xcconfig = Xcodeproj::Config.new(config)
+        @xcconfig.includes = target.pod_targets.map(&:name)
+        @xcconfig
+      end
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+module Pod
+  module Generator
+
+    # Generates the private xcconfigs for the pod targets.
+    #
+    # The private xcconfig file for a Pod target merges the configuration
+    # values of the public namespaced xcconfig with the default private
+    # configuration values required by CocoaPods.
+    #
+    class PrivatePodXCConfig < XCConfig
+
+      # Generates the xcconfig.
+      #
+      # @return [Xcodeproj::Config]
+      #
+      def generate
+        config = {
+          'ALWAYS_SEARCH_USER_PATHS'     => 'YES',
+          'OTHER_LDFLAGS'                => default_ld_flags,
+          'PODS_ROOT'                    => '${SRCROOT}',
+          'HEADER_SEARCH_PATHS'          => quote(target.build_headers.search_paths) + ' ' + quote(sandbox.public_headers.search_paths),
+          'GCC_PREPROCESSOR_DEFINITIONS' => 'COCOAPODS=1',
+          # 'USE_HEADERMAP'                => 'NO'
+        }
+
+        xcconfig = Xcodeproj::Config.new
+        target.spec_consumers.each do |consumer|
+          add_spec_build_settings_to_xcconfig(consumer, xcconfig)
+        end
+
+        xcconfig.to_hash.each do |k, v|
+          prefixed_key = target.xcconfig_prefix + k
+          config[k] = "#{config[k]} ${#{prefixed_key}}"
+        end
+
+        @xcconfig = Xcodeproj::Config.new(config)
+        @xcconfig.includes = [target.name]
+        @xcconfig
+      end
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Pod
+  module Generator
+
+    # Generates the public xcconfigs for the pod targets.
+    #
+    # The public xcconfig file for a Pod is completely namespaced to prevent
+    # configuration value collision with the build settings of other Pods. This
+    # xcconfig includes the standard podspec defined values including
+    # libraries, frameworks, weak frameworks and xcconfig overrides.
+    #
+    class PublicPodXCConfig < XCConfig
+
+      # Generates and saves the xcconfig to the given path.
+      #
+      # @param  [Pathname] path
+      #         the path where the prefix header should be stored.
+      #
+      # @return [void]
+      #
+      def save_as(path)
+        generate.save_as(path, target.xcconfig_prefix)
+      end
+
+      # Generates the xcconfig for the target.
+      #
+      # @return [Xcodeproj::Config]
+      #
+      def generate
+        @xcconfig = Xcodeproj::Config.new
+        target.spec_consumers.each do |consumer|
+          add_spec_build_settings_to_xcconfig(consumer, @xcconfig)
+        end
+        @xcconfig
+      end
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end

data/lib/cocoapods/hooks/installer_representation.rb

@@ -59,7 +59,7 @@ module Pod
       #
       def specs_by_lib
         result = {}
-        installer.libraries.each do |lib|
+        installer.pod_targets.each do |lib|
           result[installer.library_rep(lib)] = lib.specs
         end
         result
@@ -70,8 +70,8 @@ module Pod
       #
       def pods_by_lib
         result = {}
-        installer.libraries.each do |lib|
-          pod_names = lib.specs.map { |spec| spec.root.name }.uniq
+        installer.aggregate_targets.map(&:pod_targets).flatten.each do |lib|
+          pod_names = [lib.root_spec.name]
           pod_reps = pods.select { |rep| pod_names.include?(rep.name) }
           result[lib.target_definition] = pod_reps
         end

data/lib/cocoapods/installer.rb

@@ -28,11 +28,13 @@ module Pod
   #
   class Installer
 
-    autoload :Analyzer,                'cocoapods/installer/analyzer'
-    autoload :FileReferencesInstaller, 'cocoapods/installer/file_references_installer'
-    autoload :PodSourceInstaller,      'cocoapods/installer/pod_source_installer'
-    autoload :TargetInstaller,         'cocoapods/installer/target_installer'
-    autoload :UserProjectIntegrator,   'cocoapods/installer/user_project_integrator'
+    autoload :Analyzer,                 'cocoapods/installer/analyzer'
+    autoload :FileReferencesInstaller,  'cocoapods/installer/file_references_installer'
+    autoload :PodSourceInstaller,       'cocoapods/installer/pod_source_installer'
+    autoload :TargetInstaller,          'cocoapods/installer/target_installer'
+    autoload :AggregateTargetInstaller, 'cocoapods/installer/target_installer/aggregate_target_installer'
+    autoload :PodTargetInstaller,       'cocoapods/installer/target_installer/pod_target_installer'
+    autoload :UserProjectIntegrator,    'cocoapods/installer/user_project_integrator'
 
     include Config::Mixin
 
@@ -108,7 +110,8 @@ module Pod
       UI.section "Generating Pods project" do
         prepare_pods_project
         install_file_references
-        install_targets
+        install_libraries
+        link_aggregate_target
         run_post_install_hooks
         write_pod_project
         write_lockfiles
@@ -134,10 +137,10 @@ module Pod
     #
     attr_reader :names_of_pods_to_install
 
-    # @return [Array<Library>] The libraries generated by the installation
-    #         process.
+    # @return [Array<AggregateTarget>] The Podfile targets containing library
+    #         dependencies.
     #
-    attr_reader :libraries
+    attr_reader :aggregate_targets
 
     # @return [Array<Specification>] The specifications that where installed.
     #
@@ -158,14 +161,14 @@ module Pod
     def analyze
       if lockfile && lockfile.cocoapods_version > Version.new(VERSION)
         STDERR.puts '[!] The version of CocoaPods used to generate the lockfile is '\
-          'higher that the one of the current executable. Incompatibility' \
+          'higher that the one of the current executable. Incompatibility ' \
           'issues might arise.'.yellow
       end
 
       analyzer = Analyzer.new(sandbox, podfile, lockfile)
       analyzer.update_mode = update_mode
       @analysis_result = analyzer.analyze
-      @libraries = analyzer.result.libraries
+      @aggregate_targets = analyzer.result.targets
     end
 
     # Prepares the Pods folder in order to be compatible with the most recent
@@ -186,8 +189,10 @@ module Pod
     # @todo   [#247] Clean the headers of only the pods to install.
     #
     def clean_sandbox
-      sandbox.build_headers.implode!
       sandbox.public_headers.implode!
+      pod_targets.each do |pod_target|
+        pod_target.build_headers.implode!
+      end
 
       unless sandbox_state.deleted.empty?
         title_options = { :verbose_prefix => "-> ".red }
@@ -203,13 +208,15 @@ module Pod
     #       created by the Pod source installer as well.
     #
     def create_file_accessors
-      libraries.each do |library|
-        library.specs.each do |spec|
-          pod_root = sandbox.pod_dir(spec.root.name)
+      aggregate_targets.each do |target|
+        target.pod_targets.each do |pod_target|
+          pod_root = sandbox.pod_dir(pod_target.root_spec.name)
           path_list = Sandbox::PathList.new(pod_root)
-          file_accessor = Sandbox::FileAccessor.new(path_list, spec.consumer(library.platform))
-          library.file_accessors ||= []
-          library.file_accessors << file_accessor
+          file_accessors = pod_target.specs.map do |spec|
+            Sandbox::FileAccessor.new(path_list, spec.consumer(pod_target.platform))
+          end
+          pod_target.file_accessors ||= []
+          pod_target.file_accessors.concat(file_accessors)
         end
       end
     end
@@ -242,12 +249,10 @@ module Pod
     #
     def install_source_of_pod(pod_name)
       specs_by_platform = {}
-      libraries.each do |library|
-        specs = library.specs.select { |spec| spec.root.name == pod_name }
-
-        unless specs.empty?
-          specs_by_platform[library.platform] ||= []
-          specs_by_platform[library.platform].concat(specs)
+      pod_targets.each do |pod_target|
+        if pod_target.root_spec.name == pod_name
+          specs_by_platform[pod_target.platform] ||= []
+          specs_by_platform[pod_target.platform].concat(pod_target.specs)
         end
       end
 
@@ -284,7 +289,7 @@ module Pod
           @pods_project.add_podfile(config.podfile_path)
         end
         sandbox.project = @pods_project
-        platforms = libraries.map(&:platform)
+        platforms = aggregate_targets.map(&:platform)
         osx_deployment_target = platforms.select { |p| p.name == :osx }.map(&:deployment_target).min
         ios_deployment_target = platforms.select { |p| p.name == :ios }.map(&:deployment_target).min
         @pods_project.build_configurations.each do |build_configuration|
@@ -296,30 +301,53 @@ module Pod
 
 
     # Installs the file references in the Pods project. This is done once per
-    # Pod as the same file reference might be shared by multiple targets.
+    # Pod as the same file reference might be shared by multiple aggregate
+    # targets.
     #
     # @return [void]
     #
     def install_file_references
-      installer = FileReferencesInstaller.new(sandbox, libraries, pods_project)
+      installer = FileReferencesInstaller.new(sandbox, pod_targets, pods_project)
       installer.install!
     end
 
-    # Installs the targets of the Pods projects and generates their support
-    # files.
+    # Installs the aggregate targets of the Pods projects and generates their
+    # support files.
     #
     # @return [void]
     #
-    def install_targets
-      UI.message"- Installing targets" do
-        libraries.sort_by(&:name).each do |library|
-          next if library.target_definition.empty?
-          target_installer = TargetInstaller.new(sandbox, library)
+    def install_libraries
+      UI.message"- Installing libraries" do
+        pod_targets.sort_by(&:name).each do |pod_target|
+          next if pod_target.target_definition.empty?
+          target_installer = PodTargetInstaller.new(sandbox, pod_target)
+          target_installer.install!
+        end
+
+        aggregate_targets.sort_by(&:name).each do |target|
+          next if target.target_definition.empty?
+          target_installer = AggregateTargetInstaller.new(sandbox, target)
           target_installer.install!
         end
       end
     end
 
+    # Links the aggregate targets with all the dependent libraries.
+    #
+    # @note   This is run in the integration step to ensure that targets
+    #         have been created for all per spec libraries.
+    #
+    def link_aggregate_target
+      aggregate_targets.each do |aggregate_target|
+        native_target = pods_project.targets.select { |t| t.name == aggregate_target.name }.first
+        products = pods_project.products_group
+        aggregate_target.pod_targets.each do |pod_target|
+          product = products.files.select { |f| f.path == pod_target.product_name }.first
+          native_target.frameworks_build_phase.add_file_reference(product)
+        end
+      end
+    end
+
     # Writes the Pods project to the disk.
     #
     # @return [void]
@@ -364,9 +392,9 @@ module Pod
     #         information in the lockfile.
     #
     def integrate_user_project
-      UI.section "Integrating client #{'project'.pluralize(libraries.map(&:user_project_path).uniq.count) }" do
+      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, libraries)
+        integrator = UserProjectIntegrator.new(podfile, sandbox, installation_root, aggregate_targets)
         integrator.integrate!
       end
     end
@@ -512,7 +540,7 @@ module Pod
     # @return [PodRepresentation] The pod representation.
     #
     def pod_rep(pod)
-      all_file_accessors = libraries.map(&:file_accessors).flatten.compact
+      all_file_accessors = pod_targets.map(&:file_accessors).flatten.compact
       file_accessors = all_file_accessors.select { |fa| fa.spec.root.name == pod }
       Hooks::PodRepresentation.new(pod, file_accessors)
     end
@@ -526,7 +554,7 @@ module Pod
     # @return [Array<LibraryRepresentation>]
     #
     def library_reps
-      @library_reps ||= libraries.map { |lib| library_rep(lib) }
+      @library_reps ||= pod_targets.map { |lib| library_rep(lib) }
     end
 
     # @return [Array<PodRepresentation>]
@@ -543,7 +571,14 @@ module Pod
     # @return [Array<Library>] The library.
     #
     def libraries_using_spec(spec)
-      libraries.select { |lib| lib.specs.include?(spec) }
+      pod_targets.select { |pod_target| pod_target.specs.include?(spec) }
+    end
+
+    # @return [Array<Library>] The libraries generated by the installation
+    #         process.
+    #
+    def pod_targets
+      aggregate_targets.map(&:pod_targets).flatten
     end
 
     #-------------------------------------------------------------------------#