cocoapods 1.6.2 → 1.7.0.beta.1

data/lib/cocoapods/command/spec/create.rb

@@ -51,17 +51,17 @@ module Pod
         # @todo The template is outdated.
 
         def default_data_for_template(name)
-          data = {}
-          data[:name]          = name
-          data[:version]       = '0.0.1'
-          data[:summary]       = "A short description of #{name}."
-          data[:homepage]      = "http://EXAMPLE/#{name}"
-          data[:author_name]   = `git config --get user.name`.strip
-          data[:author_email]  = `git config --get user.email`.strip
-          data[:source_url]    = "http://EXAMPLE/#{name}.git"
-          data[:ref_type]      = ':tag'
-          data[:ref]           = '#{spec.version}'
-          data
+          {
+            :name => name,
+            :version => '0.0.1',
+            :summary =>  "A short description of #{name}.",
+            :homepage => "http://EXAMPLE/#{name}",
+            :author_name => Executable.capture_command('git', %w(config --get user.name), :capture => :out).first.strip,
+            :author_email => Executable.capture_command('git', %w(config --get user.email), :capture => :out).first.strip,
+            :source_url => "http://EXAMPLE/#{name}.git",
+            :ref_type => ':tag',
+            :ref => '#{spec.version}',
+          }
         end
 
         def github_data_for_template(repo_id)
@@ -112,7 +112,7 @@ module Pod
 #  Be sure to run `pod spec lint #{data[:name]}.podspec' to ensure this is a
 #  valid spec and to remove all comments including this before submitting the spec.
 #
-#  To learn more about Podspec attributes see https://docs.cocoapods.org/specification.html
+#  To learn more about Podspec attributes see https://guides.cocoapods.org/syntax/podspec.html
 #  To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
 #
 

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

@@ -32,7 +32,7 @@ module Pod
               'Multiple platforms must be comma-delimited'],
             ['--private', 'Lint skips checks that apply only to public specs'],
             ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
-             'This takes precedence over a .swift-version file.'],
+             'This takes precedence over the Swift versions specified by the spec or a `.swift-version` file.'],
             ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
             ['--skip-tests', 'Lint skips building and running tests during validation'],
           ].concat(super)

data/lib/cocoapods/command/update.rb

@@ -24,6 +24,7 @@ module Pod
           ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to update dependent pods. ' \
            'Multiple sources must be comma-delimited. The master repo will not be included by default with this option.'],
           ['--exclude-pods=podName', 'Pods to exclude during update. Multiple pods must be comma-delimited.'],
+          ['--clean-install', 'Ignore the contents of the project cache and force a full pod installation. This only applies to projects that have enabled incremental installation.'],
         ].concat(super)
       end
 
@@ -32,6 +33,7 @@ module Pod
 
         source_urls = argv.option('sources', '').split(',')
         excluded_pods = argv.option('exclude-pods', '').split(',')
+        @clean_install = argv.flag?('clean-install', false)
         unless source_urls.empty?
           source_pods = source_urls.flat_map { |url| config.sources_manager.source_with_name_or_url(url).pods }
           unless source_pods.empty?
@@ -86,6 +88,7 @@ module Pod
 
         installer = installer_for_config
         installer.repo_update = repo_update?(:default => true)
+        installer.clean_install = @clean_install
         if @pods
           verify_lockfile_exists!
           verify_pods_are_installed!

data/lib/cocoapods/config.rb

@@ -290,6 +290,7 @@ module Pod
       'CocoaPods.podfile.yaml',
       'CocoaPods.podfile',
       'Podfile',
+      'Podfile.rb',
     ].freeze
 
     public

data/lib/cocoapods/executable.rb

@@ -49,6 +49,10 @@ module Pod
       bin = which!(executable)
 
       command = command.map(&:to_s)
+      if File.basename(bin) == 'tar.exe'
+        # Tar on Windows needs --force-local
+        command.push('--force-local')
+      end
       full_command = "#{bin} #{command.join(' ')}"
 
       if Config.instance.verbose?
@@ -91,6 +95,9 @@ module Pod
       paths.uniq!
       paths.each do |path|
         bin = File.expand_path(program, path)
+        if Gem.win_platform?
+          bin += '.exe'
+        end
         if File.file?(bin) && File.executable?(bin)
           return bin
         end
@@ -114,7 +121,7 @@ module Pod
 
     # Runs the given command, capturing the desired output.
     #
-    # @param  [String] bin
+    # @param  [String] executable
     #         The binary to use.
     #
     # @param  [Array<#to_s>] command
@@ -123,23 +130,41 @@ module Pod
     # @param  [Symbol] capture
     #         Whether it should raise if the command fails.
     #
+    # @param  [Hash] env
+    #         Environment variables to be set for the command.
+    #
     # @raise  If the executable could not be located.
     #
     # @return [(String, Process::Status)]
     #         The desired captured output from the command, and the status from
     #         running the command.
     #
-    def self.capture_command(executable, command, capture: :merge)
+    def self.capture_command(executable, command, capture: :merge, env: {}, **kwargs)
       bin = which!(executable)
 
       require 'open3'
       command = command.map(&:to_s)
       case capture
-      when :merge then Open3.capture2e(bin, *command)
-      when :both then Open3.capture3(bin, *command)
-      when :out then Open3.capture3(bin, *command).values_at(0, -1)
-      when :err then Open3.capture3(bin, *command).drop(1)
-      when :none then Open3.capture3(bin, *command).last
+      when :merge then Open3.capture2e(env, [bin, bin], *command, **kwargs)
+      when :both then Open3.capture3(env, [bin, bin], *command, **kwargs)
+      when :out then Open3.capture3(env, [bin, bin], *command, **kwargs).values_at(0, -1)
+      when :err then Open3.capture3(env, [bin, bin], *command, **kwargs).drop(1)
+      when :none then Open3.capture3(env, [bin, bin], *command, **kwargs).last
+      end
+    end
+
+    # (see Executable.capture_command)
+    #
+    # @raise  If running the command fails
+    #
+    def self.capture_command!(executable, command, **kwargs)
+      capture_command(executable, command, **kwargs).tap do |result|
+        result = Array(result)
+        status = result.last
+        unless status.success?
+          output = result[0..-2].join
+          raise Informative, "#{bin} #{command.join(' ')}\n\n#{output}".strip
+        end
       end
     end
 

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/app_target_helper.rb

@@ -260,7 +260,7 @@ module Pod
 
 @implementation CPTestAppHostAppDelegate
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+- (BOOL)application:(UIApplication *)__unused application didFinishLaunchingWithOptions:(NSDictionary *)__unused launchOptions
 {
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     self.window.rootViewController = [UIViewController new];

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -154,6 +154,14 @@ module Pod
             fi
           }
 
+          # Copies the bcsymbolmap files of a vendored framework
+          install_bcsymbolmap() {
+              local bcsymbolmap_path = "$1"
+              local destination="${TARGET_BUILD_DIR}"
+              echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${bcsymbolmap_path}\" \"${destination}\""
+              rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${bcsymbolmap_path}" "${destination}"
+          }
+
           # Signs a framework with the provided identity
           code_sign_if_enabled() {
             if [ -n "${EXPANDED_CODE_SIGN_IDENTITY:-}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
@@ -206,6 +214,11 @@ module Pod
             # Vendored frameworks might have a dSYM file next to them so ensure its copied. Frameworks built from
             # sources will have their dSYM generated and copied by Xcode.
             script << %(  install_dsym "#{framework_with_dsym.dsym_path}"\n) unless framework_with_dsym.dsym_path.nil?
+            unless framework_with_dsym.bcsymbolmap_paths.nil?
+              framework_with_dsym.bcsymbolmap_paths.each do |bcsymbolmap_path|
+                script << %(  install_bcsymbolmap "#{bcsymbolmap_path}"\n)
+              end
+            end
           end
           script << "fi\n"
         end

data/lib/cocoapods/generator/file_list.rb

@@ -0,0 +1,39 @@
+module Pod
+  module Generator
+    # Generates an xcfilelist file.
+    #
+    class FileList
+      # @return [Array<String>] The paths of the files in the file list.
+      #
+      attr_reader :paths
+
+      # Initialize a new instance
+      #
+      # @param  [Array<String>] paths
+      #         @see paths
+      #
+      def initialize(paths)
+        @paths = paths
+      end
+
+      # Generates the contents of the file list.
+      #
+      # @return [String]
+      #
+      def generate
+        paths.join("\n")
+      end
+
+      # Generates and saves the file list to the given path.
+      #
+      # @param  [Pathname] path
+      #         The path where the file list should be stored.
+      #
+      # @return [void]
+      #
+      def save_as(path)
+        path.open('w') { |file_list| file_list.write(generate) }
+      end
+    end
+  end
+end

data/lib/cocoapods/generator/module_map.rb

@@ -82,7 +82,7 @@ module Pod
       # Ensures that only framework targets have `framework` prepended.
       #
       def module_specifier_prefix
-        if target.requires_frameworks?
+        if target.build_as_framework?
           'framework '
         else
           ''

data/lib/cocoapods/installer.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/string/inflections'
 require 'fileutils'
+require 'cocoapods/podfile'
 
 module Pod
   # The Installer is responsible of taking a Podfile and transform it in the
@@ -29,21 +30,22 @@ module Pod
   # source control.
   #
   class Installer
-    autoload :Analyzer,                   'cocoapods/installer/analyzer'
-    autoload :InstallationOptions,        'cocoapods/installer/installation_options'
-    autoload :PostInstallHooksContext,    'cocoapods/installer/post_install_hooks_context'
-    autoload :PreInstallHooksContext,     'cocoapods/installer/pre_install_hooks_context'
-    autoload :SourceProviderHooksContext, 'cocoapods/installer/source_provider_hooks_context'
-    autoload :PodfileValidator,           'cocoapods/installer/podfile_validator'
-    autoload :PodSourceInstaller,         'cocoapods/installer/pod_source_installer'
-    autoload :PodSourcePreparer,          'cocoapods/installer/pod_source_preparer'
-    autoload :UserProjectIntegrator,      'cocoapods/installer/user_project_integrator'
-    autoload :Xcode,                      'cocoapods/installer/xcode'
+    autoload :Analyzer,                     'cocoapods/installer/analyzer'
+    autoload :InstallationOptions,          'cocoapods/installer/installation_options'
+    autoload :PostInstallHooksContext,      'cocoapods/installer/post_install_hooks_context'
+    autoload :PreInstallHooksContext,       'cocoapods/installer/pre_install_hooks_context'
+    autoload :SourceProviderHooksContext,   'cocoapods/installer/source_provider_hooks_context'
+    autoload :PodfileValidator,             'cocoapods/installer/podfile_validator'
+    autoload :PodSourceInstaller,           'cocoapods/installer/pod_source_installer'
+    autoload :PodSourcePreparer,            'cocoapods/installer/pod_source_preparer'
+    autoload :UserProjectIntegrator,        'cocoapods/installer/user_project_integrator'
+    autoload :Xcode,                        'cocoapods/installer/xcode'
+    autoload :SandboxHeaderPathsInstaller,  'cocoapods/installer/sandbox_header_paths_installer'
+    autoload :SandboxDirCleaner,            'cocoapods/installer/sandbox_dir_cleaner'
+    autoload :ProjectCache,                 'cocoapods/installer/project_cache/project_cache'
+    autoload :TargetUUIDGenerator,          'cocoapods/installer/target_uuid_generator'
 
     include Config::Mixin
-    include InstallationOptions::Mixin
-
-    delegate_installation_options { podfile }
 
     # @return [Sandbox] The sandbox where the Pods should be installed.
     #
@@ -104,6 +106,12 @@ module Pod
     attr_accessor :deployment
     alias_method :deployment?, :deployment
 
+    # @return [Boolean] Whether installation should ignore the contents of the project cache
+    # when incremental installation is enabled.
+    #
+    attr_accessor :clean_install
+    alias_method :clean_install?, :clean_install
+
     #-------------------------------------------------------------------------#
 
     private
@@ -113,6 +121,18 @@ module Pod
     #
     attr_reader :pod_installers
 
+    # @return [ProjectInstallationCache] The installation cache stored in Pods/.project_cache/installation_cache
+    #
+    attr_reader :installation_cache
+
+    # @return [ProjectMetadataCache] The metadata cache stored in Pods/.project_cache/metadata_cache
+    #
+    attr_reader :metadata_cache
+
+    # @return [ProjectCacheVersion] The version of the project cache stored in Pods/.project_cache/version
+    #
+    attr_reader :project_cache_version
+
     #-------------------------------------------------------------------------#
 
     public
@@ -145,6 +165,33 @@ module Pod
       perform_post_install_actions
     end
 
+    def analyze_project_cache
+      user_projects = aggregate_targets.map(&:user_project).compact
+      object_version = user_projects.min_by { |p| p.object_version.to_i }.object_version.to_i unless user_projects.empty?
+
+      if !installation_options.incremental_installation
+        # Run entire installation.
+        ProjectCache::ProjectCacheAnalysisResult.new(pod_targets, aggregate_targets, {},
+                                                     analysis_result.all_user_build_configurations, object_version)
+      else
+        UI.message 'Analyzing Project Cache' do
+          @installation_cache = ProjectCache::ProjectInstallationCache.from_file(sandbox.project_installation_cache_path)
+          @metadata_cache = ProjectCache::ProjectMetadataCache.from_file(sandbox.project_metadata_cache_path)
+          @project_cache_version = ProjectCache::ProjectCacheVersion.from_file(sandbox.project_version_cache_path)
+
+          force_clean_install = clean_install || project_cache_version.version != Version.create(VersionMetadata.gem_version)
+          cache_result = ProjectCache::ProjectCacheAnalyzer.new(sandbox, installation_cache, analysis_result.all_user_build_configurations,
+                                                                object_version, pod_targets, aggregate_targets, :clean_install => force_clean_install).analyze
+          aggregate_targets_to_generate = cache_result.aggregate_targets_to_generate || []
+          pod_targets_to_generate = cache_result.pod_targets_to_generate
+          (aggregate_targets_to_generate + pod_targets_to_generate).each do |target|
+            UI.message "- Regenerating #{target.label}"
+          end
+          cache_result
+        end
+      end
+    end
+
     def prepare
       # Raise if pwd is inside Pods
       if Dir.pwd.start_with?(sandbox.root.to_path)
@@ -173,7 +220,6 @@ module Pod
       UI.section 'Analyzing dependencies' do
         analyze(analyzer)
         validate_build_configurations
-        clean_sandbox
       end
 
       UI.section 'Verifying no changes' do
@@ -192,29 +238,99 @@ module Pod
       end
     end
 
+    # Stages the sandbox after analysis.
+    #
+    # @param [Sandbox] sandbox
+    #        The sandbox to stage.
+    #
+    # @param [Array<PodTarget>] pod_targets
+    #        The list of all pod targets.
+    #
+    # @return [void]
+    #
+    def stage_sandbox(sandbox, pod_targets)
+      SandboxHeaderPathsInstaller.new(sandbox, pod_targets).install!
+    end
+
     #-------------------------------------------------------------------------#
 
     # @!group Pods Project Generation
 
     private
 
-    def create_generator
-      Xcode::PodsProjectGenerator.new(sandbox, aggregate_targets, pod_targets, analysis_result, installation_options, config)
+    def create_generator(pod_targets_to_generate, aggregate_targets_to_generate, build_configurations, project_object_version, generate_multiple_pod_projects = false)
+      if generate_multiple_pod_projects
+        Xcode::MultiPodsProjectGenerator.new(sandbox, aggregate_targets_to_generate, pod_targets_to_generate,
+                                             build_configurations, installation_options, config, project_object_version, metadata_cache)
+      else
+        Xcode::SinglePodsProjectGenerator.new(sandbox, aggregate_targets_to_generate, pod_targets_to_generate, build_configurations, installation_options, config, project_object_version)
+      end
     end
 
-    # Generate the 'Pods/Pods.xcodeproj' project.
+    # Generates the Xcode project(s) that go inside the `Pods/` directory.
     #
-    def generate_pods_project(generator = create_generator)
+    def generate_pods_project
+      stage_sandbox(sandbox, pod_targets)
+
+      cache_analysis_result = analyze_project_cache
+      pod_targets_to_generate = cache_analysis_result.pod_targets_to_generate
+      aggregate_targets_to_generate = cache_analysis_result.aggregate_targets_to_generate
+
+      clean_sandbox(pod_targets_to_generate)
+
+      create_and_save_projects(pod_targets_to_generate, aggregate_targets_to_generate,
+                               cache_analysis_result.build_configurations, cache_analysis_result.project_object_version)
+      SandboxDirCleaner.new(sandbox, pod_targets, aggregate_targets).clean!
+
+      update_project_cache(cache_analysis_result, target_installation_results)
+      write_lockfiles
+    end
+
+    def create_and_save_projects(pod_targets_to_generate, aggregate_targets_to_generate, build_configurations, project_object_version)
       UI.section 'Generating Pods project' do
-        @target_installation_results = generator.generate!
-        @pods_project = generator.project
+        generator = create_generator(pod_targets_to_generate, aggregate_targets_to_generate,
+                                     build_configurations, project_object_version,
+                                     installation_options.generate_multiple_pod_projects)
+
+        pod_project_generation_result = generator.generate!
+        @target_installation_results = pod_project_generation_result.target_installation_results
+        @pods_project = pod_project_generation_result.project
+        # The `pod_target_subprojects` is used for backwards compatibility so that consumers can iterate over
+        # all pod targets across projects without needing to open each one.
+        @pod_target_subprojects = pod_project_generation_result.projects_by_pod_targets.keys
+        @generated_projects = ([pods_project] + pod_target_subprojects || []).compact
+        @generated_pod_targets = pod_targets_to_generate
+        @generated_aggregate_targets = aggregate_targets_to_generate || []
+        projects_by_pod_targets = pod_project_generation_result.projects_by_pod_targets
+
+        predictabilize_uuids(generated_projects) if installation_options.deterministic_uuids?
+        stabilize_target_uuids(generated_projects)
+
         run_podfile_post_install_hooks
-        generator.write
-        generator.share_development_pod_schemes
-        write_lockfiles
+
+        projects_writer = Xcode::PodsProjectWriter.new(sandbox, generated_projects,
+                                                       target_installation_results.pod_target_installation_results, installation_options)
+        projects_writer.write!
+
+        pods_project_pod_targets = pod_targets_to_generate - projects_by_pod_targets.values.flatten
+        all_projects_by_pod_targets = {}
+        pods_project_by_targets = { pods_project => pods_project_pod_targets } if pods_project
+        all_projects_by_pod_targets.merge!(pods_project_by_targets) if pods_project_by_targets
+        all_projects_by_pod_targets.merge!(projects_by_pod_targets) if projects_by_pod_targets
+        all_projects_by_pod_targets.each do |project, pod_targets|
+          generator.share_development_pod_schemes(project, development_pod_targets(pod_targets))
+        end
       end
     end
 
+    def predictabilize_uuids(projects)
+      UI.message('- Generating deterministic UUIDs') { Xcodeproj::Project.predictabilize_uuids(projects) }
+    end
+
+    def stabilize_target_uuids(projects)
+      UI.message('- Stabilizing target UUIDs') { TargetUUIDGenerator.new(projects).generate! }
+    end
+
     #-------------------------------------------------------------------------#
 
     public
@@ -235,6 +351,10 @@ module Pod
     #
     attr_reader :pods_project
 
+    # @return [Array<Pod::Project>] the subprojects nested under pods_project.
+    #
+    attr_reader :pod_target_subprojects
+
     # @return [Array<AggregateTarget>] The model representations of an
     #         aggregation of pod targets generated for a target definition
     #         in the Podfile as result of the analyzer.
@@ -246,6 +366,18 @@ module Pod
     #
     attr_reader :pod_targets
 
+    # @return [Array<Project>] The list of projects generated from the installation.
+    #
+    attr_reader :generated_projects
+
+    # @return [Array<PodTarget>] The list of pod targets that were generated from the installation.
+    #
+    attr_reader :generated_pod_targets
+
+    # @return [Array<AggregateTarget>] The list of aggregate targets that were generated from the installation.
+    #
+    attr_reader :generated_aggregate_targets
+
     # @return [Array<Specification>] The specifications that were installed.
     #
     attr_accessor :installed_specs
@@ -269,9 +401,7 @@ module Pod
     end
 
     def create_analyzer(plugin_sources = nil)
-      Analyzer.new(sandbox, podfile, lockfile, plugin_sources, has_dependencies?, update).tap do |analyzer|
-        analyzer.installation_options = installation_options
-      end
+      Analyzer.new(sandbox, podfile, lockfile, plugin_sources, has_dependencies?, update)
     end
 
     # Ensures that the white-listed build configurations are known to prevent
@@ -295,26 +425,15 @@ module Pod
       end
     end
 
-    # @return [void] In this step we clean all the folders that will be
-    #         regenerated from scratch and any file which might not be
-    #         overwritten.
+    # @return [void] In this step we clean all the header folders for pod targets that will be
+    #         regenerated from scratch and cleanup any pods that have been removed.
     #
-    # @todo   [#247] Clean the headers of only the pods to install.
-    #
-    def clean_sandbox
-      sandbox.public_headers.implode!
-      target_support_dirs = sandbox.target_support_files_root.children.select(&:directory?)
+    def clean_sandbox(pod_targets)
       pod_targets.each do |pod_target|
-        pod_target.build_headers.implode!
-        target_support_dirs.delete(pod_target.support_files_dir)
+        pod_target.build_headers.implode_path!(pod_target.headers_sandbox)
+        sandbox.public_headers.implode_path!(pod_target.headers_sandbox)
       end
 
-      aggregate_targets.each do |aggregate_target|
-        target_support_dirs.delete(aggregate_target.support_files_dir)
-      end
-
-      target_support_dirs.each { |dir| FileUtils.rm_rf(dir) }
-
       unless sandbox_state.deleted.empty?
         title_options = { :verbose_prefix => '-> '.red }
         sandbox_state.deleted.each do |pod_name|
@@ -497,7 +616,7 @@ module Pod
       if any_plugin_post_install_hooks?
         unlock_pod_sources
 
-        context = PostInstallHooksContext.generate(sandbox, aggregate_targets)
+        context = PostInstallHooksContext.generate(sandbox, pods_project, aggregate_targets)
         HooksManager.run(:post_install, context, plugins)
       end
 
@@ -631,6 +750,21 @@ module Pod
       end
     end
 
+    def update_project_cache(cache_analysis_result, target_installation_results)
+      return unless installation_cache || metadata_cache
+      installation_cache.update_cache_key_by_target_label!(cache_analysis_result.cache_key_by_target_label)
+      installation_cache.update_project_object_version!(cache_analysis_result.project_object_version)
+      installation_cache.update_build_configurations!(cache_analysis_result.build_configurations)
+      installation_cache.save_as(sandbox.project_installation_cache_path)
+
+      metadata_cache.update_metadata!(target_installation_results.pod_target_installation_results || {},
+                                      target_installation_results.aggregate_target_installation_results || {})
+      metadata_cache.save_as(sandbox.project_metadata_cache_path)
+
+      cache_version = ProjectCache::ProjectCacheVersion.new(VersionMetadata.gem_version)
+      cache_version.save_as(sandbox.project_version_cache_path)
+    end
+
     # Integrates the user projects adding the dependencies on the CocoaPods
     # libraries, setting them up to use the xcconfigs and performing other
     # actions. This step is also responsible of creating the workspace if
@@ -641,7 +775,7 @@ module Pod
     def integrate_user_project
       UI.section "Integrating client #{'project'.pluralize(aggregate_targets.map(&:user_project_path).uniq.count)}" do
         installation_root = config.installation_root
-        integrator = UserProjectIntegrator.new(podfile, sandbox, installation_root, aggregate_targets)
+        integrator = UserProjectIntegrator.new(podfile, sandbox, installation_root, generated_aggregate_targets, :use_input_output_paths => !installation_options.disable_input_output_paths?)
         integrator.integrate!
       end
     end
@@ -709,11 +843,13 @@ module Pod
 
     public
 
+    # @param [Array<PodTarget>] targets
+    #
     # @return [Array<PodTarget>] The targets of the development pods generated by
     #         the installation process. This can be used as a convenience method for external scripts.
     #
-    def development_pod_targets
-      pod_targets.select do |pod_target|
+    def development_pod_targets(targets = pod_targets)
+      targets.select do |pod_target|
         sandbox.local?(pod_target.pod_name)
       end
     end
@@ -737,6 +873,12 @@ module Pod
       analysis_result.sandbox_state
     end
 
+    # @return [InstallationOptions] the installation options to use during install
+    #
+    def installation_options
+      podfile.installation_options
+    end
+
     #-------------------------------------------------------------------------#
 
     public