cocoapods 0.39.0 → 1.0.0.beta.1

data/lib/cocoapods/external_sources/path_source.rb

@@ -24,7 +24,7 @@ module Pod
       # @see  AbstractExternalSource#description
       #
       def description
-        "from `#{params[:path] || params[:local]}`"
+        "from `#{declared_path}`"
       end
 
       private
@@ -34,7 +34,7 @@ module Pod
       # @return [String] The path as declared by the user.
       #
       def declared_path
-        result = params[:path] || params[:local]
+        result = params[:path]
         result.to_s if result
       end
 

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/acknowledgements.rb

@@ -45,7 +45,7 @@ module Pod
       # @return [String] the foot notes.
       #
       def footnote_text
-        'Generated by CocoaPods - http://cocoapods.org'
+        'Generated by CocoaPods - https://cocoapods.org'
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/generator/acknowledgements/plist.rb

@@ -6,7 +6,7 @@ module Pod
       end
 
       def save_as(path)
-        Xcodeproj::PlistHelper.write(plist, path)
+        Xcodeproj::Plist.write_to_path(plist, path)
       end
 
       def plist

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -114,44 +114,51 @@ realpath() {
 
 install_resource()
 {
-  case $1 in
+  if [[ "$1" = /* ]] ; then
+    RESOURCE_PATH="$1"
+  else
+    RESOURCE_PATH="${PODS_ROOT}/$1"
+  fi
+  if [[ ! -e "$RESOURCE_PATH" ]] ; then
+    cat << EOM
+error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script.
+EOM
+    exit 1
+  fi
+  case $RESOURCE_PATH in
     *\.storyboard)
-      echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$1\\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
-      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$1\\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}"
       ;;
     *\.xib)
-      echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$1\\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
-      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$1\\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}"
       ;;
     *.framework)
       echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "rsync -av $RESOURCE_PATH ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -av "$RESOURCE_PATH" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       ;;
     *.xcdatamodel)
-      echo "xcrun momc \\"${PODS_ROOT}/$1\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\\""
-      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom"
+      echo "xcrun momc \\"$RESOURCE_PATH\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\\""
+      xcrun momc "$RESOURCE_PATH" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom"
       ;;
     *.xcdatamodeld)
-      echo "xcrun momc \\"${PODS_ROOT}/$1\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\\""
-      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd"
+      echo "xcrun momc \\"$RESOURCE_PATH\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\\""
+      xcrun momc "$RESOURCE_PATH" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd"
       ;;
     *.xcmappingmodel)
-      echo "xcrun mapc \\"${PODS_ROOT}/$1\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\\""
-      xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm"
+      echo "xcrun mapc \\"$RESOURCE_PATH\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\\""
+      xcrun mapc "$RESOURCE_PATH" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
       ;;
     *.xcassets)
-      ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1")
+      ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
       XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
       ;;
-    /*)
-      echo "$1"
-      echo "$1" >> "$RESOURCES_TO_COPY"
-      ;;
     *)
-      echo "${PODS_ROOT}/$1"
-      echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
+      echo "$RESOURCE_PATH"
+      echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY"
       ;;
   esac
 }
@@ -195,7 +202,7 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  printf "%s\\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi
 EOS
     end

data/lib/cocoapods/generator/info_plist_file.rb

@@ -39,7 +39,8 @@ module Pod
       #
       def target_version
         if target && target.respond_to?(:root_spec)
-          target.root_spec.version.to_s
+          version = target.root_spec.version
+          [version.major, version.minor, version.patch].join('.')
         else
           '1.0.0'
         end
@@ -50,20 +51,35 @@ module Pod
       # @return [String]
       #
       def generate
-        FILE_CONTENTS.sub('${CURRENT_PROJECT_VERSION_STRING}', target_version)
+        header + dict + footer
       end
 
-      FILE_CONTENTS = <<-EOS
+      private
+
+      def header
+        <<-PLIST
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+        PLIST
+      end
+
+      def footer
+        <<-PLIST
+</dict>
+</plist>
+        PLIST
+      end
+
+      def dict
+        dict = <<-PLIST
   <key>CFBundleDevelopmentRegion</key>
   <string>en</string>
   <key>CFBundleExecutable</key>
   <string>${EXECUTABLE_NAME}</string>
   <key>CFBundleIdentifier</key>
-  <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
+  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleName</key>
@@ -71,16 +87,26 @@ module Pod
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>${CURRENT_PROJECT_VERSION_STRING}</string>
+  <string>#{target_version}</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>${CURRENT_PROJECT_VERSION}</string>
   <key>NSPrincipalClass</key>
   <string></string>
-</dict>
-</plist>
-      EOS
+        PLIST
+
+        if target.platform.name == :tvos
+          dict << <<-PLIST
+  <key>UIRequiredDeviceCapabilities</key>
+  <array>
+    <string>arm64</string>
+  </array>
+          PLIST
+        end
+
+        dict
+      end
     end
   end
 end

data/lib/cocoapods/generator/module_map.rb

@@ -10,17 +10,12 @@ module Pod
       #
       attr_reader :target
 
-      # @return [Array<#to_s>] the private headers of the module
-      #
-      attr_accessor :private_headers
-
       # Initialize a new instance
       #
       # @param  [PodTarget] target @see target
       #
       def initialize(target)
         @target = target
-        @private_headers = []
       end
 
       # Generates and saves the Info.plist to the given path.
@@ -42,24 +37,14 @@ module Pod
       # @return [String]
       #
       def generate
-        result = <<-eos.strip_heredoc
+        <<-MODULE_MAP.strip_heredoc
           framework module #{target.product_module_name} {
             umbrella header "#{target.umbrella_header_path.basename}"
 
             export *
             module * { export * }
-        eos
-
-        result << "\n#{generate_private_header_exports}" unless private_headers.empty?
-        result << "}\n"
-      end
-
-      private
-
-      def generate_private_header_exports
-        private_headers.reduce('') do |string, header|
-          string << %(  private header "#{header}"\n)
-        end
+          }
+        MODULE_MAP
       end
     end
   end

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

@@ -87,15 +87,12 @@ module Pod
 
         #---------------------------------------------------------------------#
 
-        private
+        protected
 
-        # Add build settings, which ensure that the pod targets can be imported
-        # from the integrating target by all sort of imports, which are:
-        #  - `#import <…>`
-        #  - `#import "…"`
-        #  - `@import …;` / `import …`
+        # @return [Hash<String, String>] the build settings necessary to import
+        #         the pod targets.
         #
-        def generate_settings_to_import_pod_targets
+        def settings_to_import_pod_targets
           if target.requires_frameworks?
             framework_header_search_paths = pod_targets.select(&:should_build?).map do |target|
               if target.scoped?
@@ -118,17 +115,32 @@ module Pod
             if pod_targets.any? { |t| t.should_build? && t.scoped? }
               build_settings['FRAMEWORK_SEARCH_PATHS'] = '"$PODS_FRAMEWORK_BUILD_PATH"'
             end
-            @xcconfig.merge!(build_settings)
+            build_settings
           else
             # Make headers discoverable from $PODS_ROOT/Headers directory
             header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
-            build_settings = {
+            {
               # by `#import "…"`
               'HEADER_SEARCH_PATHS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths),
               # by `#import <…>`
               'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-isystem'),
             }
-            @xcconfig.merge!(build_settings)
+          end
+        end
+
+        private
+
+        # Add build settings, which ensure that the pod targets can be imported
+        # from the integrating target by all sort of imports, which are:
+        #  - `#import <…>`
+        #  - `#import "…"`
+        #  - `@import …;` / `import …`
+        #
+        def generate_settings_to_import_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!(generator.settings_to_import_pod_targets)
           end
         end
 

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

@@ -50,7 +50,8 @@ module Pod
             'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths),
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
             'SKIP_INSTALL' => 'YES',
-            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) '
+            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ',
+            'PRODUCT_BUNDLE_IDENTIFIER' => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}',
             # 'USE_HEADERMAP' => 'NO'
           }
 

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

@@ -153,7 +153,8 @@ module Pod
         #         The path retrieved from Sandbox#root.
         #
         def self.add_library_build_settings(library_path, xcconfig, sandbox_root)
-          name = File.basename(library_path, '.a').sub(/\Alib/, '')
+          extension = File.extname(library_path)
+          name = File.basename(library_path, extension).sub(/\Alib/, '')
           dirname = '${PODS_ROOT}/' + library_path.dirname.relative_path_from(sandbox_root).to_s
           build_settings = {
             'OTHER_LDFLAGS' => "-l#{name}",

data/lib/cocoapods/hooks_manager.rb

@@ -44,11 +44,9 @@ module Pod
       #
       def initialize(name, plugin_name, block)
         raise ArgumentError, 'Missing name' unless name
+        raise ArgumentError, 'Missing plugin_name' unless plugin_name
         raise ArgumentError, 'Missing block' unless block
 
-        UI.warn '[Hooks] The use of hooks without specifying a `plugin_name` ' \
-                "has been deprecated (from file `#{block.binding.eval('File.expand_path __FILE__')}`)." unless plugin_name
-
         @name = name
         @plugin_name = plugin_name
         @block = block
@@ -72,13 +70,7 @@ module Pod
       # @param  [Proc] block
       #         The block.
       #
-      def register(plugin_name, hook_name = nil, &block)
-        # TODO: Backwards compatibility with nameless plugins from CP 0.34
-        if hook_name.nil?
-          hook_name = plugin_name
-          plugin_name = nil
-        end
-
+      def register(plugin_name, hook_name, &block)
         @registrations ||= {}
         @registrations[hook_name] ||= []
         @registrations[hook_name] << Hook.new(hook_name, plugin_name, block)
@@ -108,7 +100,7 @@ module Pod
             UI.message "- Running #{name.to_s.tr('_', ' ')} hooks" do
               hooks.each do |hook|
                 next if whitelisted_plugins && !whitelisted_plugins.key?(hook.plugin_name)
-                UI.message "- #{hook.plugin_name || 'unknown plugin'} from " \
+                UI.message "- #{hook.plugin_name} from " \
                            "`#{hook.block.source_location.first}`" do
                   block = hook.block
                   if block.arity > 1

data/lib/cocoapods/installer.rb

@@ -32,6 +32,7 @@ module Pod
     autoload :AggregateTargetInstaller,   'cocoapods/installer/target_installer/aggregate_target_installer'
     autoload :Analyzer,                   'cocoapods/installer/analyzer'
     autoload :FileReferencesInstaller,    'cocoapods/installer/file_references_installer'
+    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'
@@ -44,6 +45,9 @@ module Pod
     autoload :UserProjectIntegrator,      'cocoapods/installer/user_project_integrator'
 
     include Config::Mixin
+    include InstallationOptions::Mixin
+
+    delegate_installation_options { podfile }
 
     # @return [Sandbox] The sandbox where the Pods should be installed.
     #
@@ -109,12 +113,19 @@ module Pod
       verify_no_static_framework_transitive_dependencies
       verify_framework_usage
       generate_pods_project
-      integrate_user_project if config.integrate_targets?
+      integrate_user_project if installation_options.integrate_targets?
       perform_post_install_actions
     end
 
     def prepare
+      # Raise if pwd is inside Pods
+      if Dir.pwd.start_with?(sandbox.root.to_path)
+        message = 'Command should be run from a directory outside Pods directory.'
+        message << "\n\n\tCurrent directory is #{UI.path(Pathname.pwd)}\n"
+        raise Informative, message
+      end
       UI.message 'Preparing' do
+        deintegrate_if_different_major_version
         sandbox.prepare
         ensure_plugins_are_installed!
         Migrator.migrate(sandbox)
@@ -135,7 +146,6 @@ module Pod
       UI.section 'Analyzing dependencies' do
         analyze(analyzer)
         validate_build_configurations
-        prepare_for_legacy_compatibility
         clean_sandbox
       end
     end
@@ -215,7 +225,9 @@ module Pod
     end
 
     def create_analyzer
-      Analyzer.new(sandbox, podfile, lockfile)
+      Analyzer.new(sandbox, podfile, lockfile).tap do |analyzer|
+        analyzer.installation_options = installation_options
+      end
     end
 
     # Ensures that the white-listed build configurations are known to prevent
@@ -237,17 +249,6 @@ module Pod
       end
     end
 
-    # Prepares the Pods folder in order to be compatible with the most recent
-    # version of CocoaPods.
-    #
-    # @return [void]
-    #
-    def prepare_for_legacy_compatibility
-      # move_target_support_files_if_needed
-      # move_Local_Podspecs_to_Podspecs_if_needed
-      # move_pods_to_sources_folder_if_needed
-    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.
@@ -323,7 +324,7 @@ module Pod
       end
 
       @pod_installers ||= []
-      pod_installer = PodSourceInstaller.new(sandbox, specs_by_platform)
+      pod_installer = PodSourceInstaller.new(sandbox, specs_by_platform, :can_cache => installation_options.clean?)
       @pod_installers << pod_installer
       pod_installer
     end
@@ -345,7 +346,7 @@ module Pod
     # @todo Why the @pod_installers might be empty?
     #
     def clean_pod_sources
-      return unless config.clean?
+      return unless installation_options.clean?
       return unless @pod_installers
       @pod_installers.each(&:clean!)
     end
@@ -367,7 +368,7 @@ module Pod
     # @todo Why the @pod_installers might be empty?
     #
     def lock_pod_sources
-      return unless config.lock_pod_source?
+      return unless installation_options.lock_pod_sources?
       return unless @pod_installers
       @pod_installers.each do |installer|
         pod_target = pod_targets.find { |target| target.pod_name == installer.name }
@@ -386,6 +387,7 @@ module Pod
       aggregate_targets.each do |aggregate_target|
         aggregate_target.pod_targets.each do |pod_target|
           pod_target.host_requires_frameworks ||= aggregate_target.requires_frameworks?
+          pod_target.platform = nil # needs to be recomputed
         end
       end
     end
@@ -394,7 +396,7 @@ module Pod
       aggregate_targets.each do |aggregate_target|
         aggregate_target.user_build_configurations.keys.each do |config|
           pod_targets = aggregate_target.pod_targets_for_build_configuration(config)
-          vendored_frameworks = pod_targets.flat_map(&:file_accessors).flat_map(&:vendored_frameworks)
+          vendored_frameworks = pod_targets.flat_map(&:file_accessors).flat_map(&:vendored_frameworks).uniq
           frameworks = vendored_frameworks.map { |fw| fw.basename('.framework') }
           frameworks += pod_targets.select { |pt| pt.should_build? && pt.requires_frameworks? }.map(&:product_module_name)
 
@@ -491,6 +493,25 @@ module Pod
       context.sources
     end
 
+    # Run the deintegrator against all projects in the installation root if the
+    # current CocoaPods major version part is different than the one in the
+    # lockfile.
+    #
+    # @return [void]
+    #
+    def deintegrate_if_different_major_version
+      return unless lockfile
+      return if lockfile.cocoapods_version.major == Version.create(VERSION).major
+      UI.section('Fully deintegrating due to major version update') do
+        projects = Pathname.glob(config.installation_root + '*.xcodeproj').map { |path| Xcodeproj::Project.open(path) }
+        deintegrator = Deintegrator.new
+        projects.sort.each do |project|
+          deintegrator.deintegrate_project(project)
+          project.save if project.dirty?
+        end
+      end
+    end
+
     # Ensures that all plugins specified in the {#podfile} are loaded.
     #
     # @return [void]
@@ -548,9 +569,7 @@ module Pod
     #
     def prepare_pods_project
       UI.message '- Creating Pods project' do
-        object_version = aggregate_targets.map(&:user_project_path).compact.map do |path|
-          Xcodeproj::Project.open(path).object_version.to_i
-        end.min
+        object_version = aggregate_targets.map(&:user_project).compact.map { |p| p.object_version.to_i }.min
 
         if object_version
           @pods_project = Pod::Project.new(sandbox.project_path, false, object_version)
@@ -610,13 +629,13 @@ module Pod
     def install_libraries
       UI.message '- Installing targets' do
         pod_targets.sort_by(&:name).each do |pod_target|
-          next if pod_target.target_definitions.flat_map(&:dependencies).empty?
+          next if pod_target.target_definitions.all?(&:abstract?)
           target_installer = PodTargetInstaller.new(sandbox, pod_target)
           target_installer.install!
         end
 
         aggregate_targets.sort_by(&:name).each do |target|
-          next if target.target_definition.dependencies.empty?
+          next if target.target_definition.abstract?
           target_installer = AggregateTargetInstaller.new(sandbox, target)
           target_installer.install!
         end
@@ -643,7 +662,8 @@ module Pod
       frameworks_group = pods_project.frameworks_group
       aggregate_targets.each do |aggregate_target|
         is_app_extension = !(aggregate_target.user_targets.map(&:symbol_type) &
-          [:app_extension, :watch_extension, :watch2_extension]).empty?
+          [:app_extension, :watch_extension, :watch2_extension, :tv_extension]).empty?
+        is_app_extension ||= aggregate_target.user_targets.any? { |ut| ut.common_resolved_build_setting('APPLICATION_EXTENSION_API_ONLY') == 'YES' }
 
         aggregate_target.pod_targets.each do |pod_target|
           configure_app_extension_api_only_for_target(aggregate_target) if is_app_extension
@@ -692,7 +712,7 @@ module Pod
         pods_project.development_pods.remove_from_project if pods_project.development_pods.empty?
         pods_project.sort(:groups_position => :below)
         pods_project.recreate_user_schemes(false)
-        if config.deterministic_uuids?
+        if installation_options.deterministic_uuids?
           UI.message('- Generating deterministic UUIDs') { pods_project.predictabilize_uuids }
         end
         pods_project.save