cocoapods 1.0.1 → 1.1.0.beta.1

data/lib/cocoapods/installer/analyzer.rb

@@ -226,6 +226,61 @@ module Pod
 
       private
 
+      # Copies the pod_targets of any of the app embedded aggregate targets into
+      # their potential host aggregate target, if that potential host aggregate target's
+      # user_target hosts any of the app embedded aggregate targets' user_targets
+      #
+      # @param  [AggregateTarget] aggregate_target the aggregate target whose user_target
+      #         might host one or more of the embedded aggregate targets' user_targets
+      #
+      # @param  [Array<AggregateTarget>] embedded_aggregate_targets the aggregate targets
+      #         representing the embedded targets to be integrated
+      #
+      def copy_embedded_target_pod_targets_to_host(aggregate_target, embedded_aggregate_targets)
+        return if aggregate_target.requires_host_target?
+        # Get the uuids of the aggregate_target's user_targets' embedded targets if any
+        embedded_uuids = Set.new(aggregate_target.user_targets.map do |target|
+          aggregate_target.user_project.embedded_targets_in_native_target(target).map(&:uuid)
+        end.flatten)
+        return if embedded_uuids.empty?
+        embedded_aggregate_targets.each do |embedded_target|
+          next unless embedded_target.user_targets.map(&:uuid).any? do |embedded_uuid|
+            embedded_uuids.include? embedded_uuid
+          end
+          raise Informative, "#{aggregate_target.name} must call use_frameworks! because it is hosting an embedded target that calls use_frameworks!." unless aggregate_target.requires_frameworks?
+          pod_target_names = aggregate_target.pod_targets.map(&:name)
+          # This embedded target is hosted by the aggregate target's user_target; copy over the non-duplicate pod_targets
+          aggregate_target.pod_targets = aggregate_target.pod_targets + embedded_target.pod_targets.select do |pod_target|
+            !pod_target_names.include? pod_target.name
+          end
+        end
+      end
+
+      # Raises an error if there are embedded targets in the Podfile, but
+      # their host targets have not been declared in the Podfile
+      #
+      # @param  [Array<AggregateTarget>] aggregate_targets the generated
+      #         aggregate targets
+      #
+      # @param  [Array<AggregateTarget>] embedded_aggregate_targets the aggregate targets
+      #         representing the embedded targets to be integrated
+      #
+      def verify_host_targets_in_podfile(aggregate_targets, embedded_aggregate_targets)
+        aggregate_target_uuids = Set.new aggregate_targets.map(&:user_targets).flatten.map(&:uuid)
+        embedded_targets_missing_hosts = []
+        embedded_aggregate_targets.each do |target|
+          host_uuids = target.user_targets.map do |user_target|
+            target.user_project.host_targets_for_embedded_target(user_target).map(&:uuid)
+          end.flatten
+          embedded_targets_missing_hosts << target unless host_uuids.any? do |uuid|
+            aggregate_target_uuids.include? uuid
+          end
+        end
+        unless embedded_targets_missing_hosts.empty?
+          raise Informative, "Unable to find host target for #{embedded_targets_missing_hosts.map(&:name).join(', ')}. Please add the host targets for the embedded targets to the Podfile."
+        end
+      end
+
       # Creates the models that represent the targets generated by CocoaPods.
       #
       # @return [Array<AggregateTarget>]
@@ -236,6 +291,14 @@ module Pod
         aggregate_targets = specs_by_target.keys.map do |target_definition|
           generate_target(target_definition, pod_targets)
         end
+        if installation_options.integrate_targets?
+          # Copy embedded target pods that cannot have their pods embedded as frameworks to their host targets
+          embedded_targets = aggregate_targets.select(&:requires_host_target?).select(&:requires_frameworks?)
+          verify_host_targets_in_podfile(aggregate_targets, embedded_targets)
+          aggregate_targets.each do |target|
+            copy_embedded_target_pod_targets_to_host(target, embedded_targets)
+          end
+        end
         aggregate_targets.each do |target|
           target.search_paths_aggregate_targets = aggregate_targets.select do |aggregate_target|
             target.target_definition.targets_to_inherit_search_paths.include?(aggregate_target.target_definition)
@@ -277,6 +340,7 @@ module Pod
         target.pod_targets = pod_targets.select do |pod_target|
           pod_target.target_definitions.include?(target_definition)
         end
+
         target
       end
 
@@ -294,7 +358,7 @@ module Pod
           distinct_targets = 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?)
+              pod_variant = PodVariant.new(specs, target_definition.platform, target_definition.uses_frameworks?, target_definition.swift_version)
               hash[root_spec] ||= {}
               (hash[root_spec][pod_variant] ||= []) << target_definition
             end

data/lib/cocoapods/installer/analyzer/pod_variant.rb

@@ -16,6 +16,10 @@ module Pod
         attr_accessor :requires_frameworks
         alias_method :requires_frameworks?, :requires_frameworks
 
+        # @return [String] the Swift version
+        #
+        attr_accessor :swift_version
+
         # @return [Specification] the root specification
         #
         def root_spec
@@ -28,10 +32,11 @@ module Pod
         # @param [Platform] platform         @see #platform
         # @param [Bool] requires_frameworks  @see #requires_frameworks?
         #
-        def initialize(specs, platform, requires_frameworks = false)
+        def initialize(specs, platform, requires_frameworks = false, swift_version = nil)
           self.specs = specs
           self.platform = platform
           self.requires_frameworks = requires_frameworks
+          self.swift_version = swift_version
         end
 
         # @return [Bool] whether the {PodVariant} is equal to another taking all
@@ -41,7 +46,8 @@ module Pod
           self.class == other.class &&
             specs == other.specs &&
             platform == other.platform &&
-            requires_frameworks == other.requires_frameworks
+            requires_frameworks == other.requires_frameworks &&
+            swift_version == other.swift_version
         end
         alias_method :eql?, :==
 
@@ -51,7 +57,7 @@ module Pod
         #
         # @!visibility private
         def hash
-          [specs, platform, requires_frameworks].hash
+          [specs, platform, requires_frameworks, swift_version].hash
         end
       end
     end

data/lib/cocoapods/installer/analyzer/target_inspector.rb

@@ -44,6 +44,7 @@ module Pod
           result.platform = compute_platform(targets)
           result.archs = compute_archs(targets)
           result.project = user_project
+          result.target_definition.swift_version = compute_swift_version_from_targets(targets)
           result
         end
 
@@ -205,6 +206,29 @@ module Pod
             end
           end
         end
+
+        # Compute the Swift version for the target build configurations. If more
+        # than one Swift version is defined for a given target, then it will raise.
+        #
+        # @param  [Array<PBXNativeTarget>] targets
+        #         the targets that are checked for Swift versions.
+        #
+        # @return [String] the targets Swift version or nil
+        #
+        def compute_swift_version_from_targets(targets)
+          versions = targets.flat_map(&:build_configurations).
+            flat_map { |config| config.build_settings['SWIFT_VERSION'] }.
+            compact.
+            uniq
+          case versions.count
+          when 0
+            nil
+          when 1
+            versions.first
+          else
+            raise Informative, 'There may only be up to 1 unique SWIFT_VERSION per target.'
+          end
+        end
       end
     end
   end

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -20,7 +20,10 @@ module Pod
         # @return [Array<Symbol>] the symbol types, which require that the pod
         # frameworks are embedded in the output directory / product bundle.
         #
-        EMBED_FRAMEWORK_TARGET_TYPES = [:application, :unit_test_bundle, :app_extension, :watch_extension, :watch2_extension].freeze
+        # @note This does not include :app_extension or :watch_extension because
+        # these types must have their frameworks embedded in their host targets
+        #
+        EMBED_FRAMEWORK_TARGET_TYPES = [:application, :unit_test_bundle, :ui_test_bundle, :watch2_extension].freeze
 
         # @return [String] the name of the embed frameworks phase
         #
@@ -54,6 +57,7 @@ module Pod
 
             add_pods_library
             add_embed_frameworks_script_phase
+            remove_embed_frameworks_script_phase_from_embedded_targets
             add_copy_resources_script_phase
             add_check_manifest_lock_script_phase
           end
@@ -110,6 +114,20 @@ module Pod
           end
         end
 
+        # Removes the embed frameworks build phase from embedded targets
+        #
+        # @note Older versions of CocoaPods would add this build phase to embedded
+        #       targets. They should be removed on upgrade because embedded targets
+        #       will have their frameworks embedded in their host targets.
+        #
+        def remove_embed_frameworks_script_phase_from_embedded_targets
+          native_targets.each do |native_target|
+            if AggregateTarget::EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES.include? native_target.symbol_type
+              remove_embed_frameworks_script_phase(native_target)
+            end
+          end
+        end
+
         def add_embed_frameworks_script_phase_to_target(native_target)
           phase = create_or_update_build_phase(native_target, EMBED_FRAMEWORK_PHASE_NAME)
           script_path = target.embed_frameworks_script_relative_path
@@ -121,7 +139,7 @@ module Pod
         # @param [PBXNativeTarget] native_target
         #
         def remove_embed_frameworks_script_phase(native_target)
-          embed_build_phase = native_target.shell_script_build_phases.find { |bp| bp.name == EMBED_FRAMEWORK_PHASE_NAME }
+          embed_build_phase = native_target.shell_script_build_phases.find { |bp| bp.name && bp.name.end_with?(EMBED_FRAMEWORK_PHASE_NAME) }
           return unless embed_build_phase.present?
           native_target.build_phases.delete(embed_build_phase)
         end
@@ -157,10 +175,9 @@ module Pod
             native_target.build_phases.unshift(phase).uniq! unless native_target.build_phases.first == phase
             phase.shell_script = <<-SH.strip_heredoc
               diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
-              if [[ $? != 0 ]] ; then
-                  cat << EOM
-              error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
-              EOM
+              if [ $? != 0 ] ; then
+                  # print error to STDERR
+                  echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
                   exit 1
               fi
             SH

data/lib/cocoapods/installer/xcode.rb

@@ -0,0 +1,7 @@
+module Pod
+  class Installer
+    class Xcode
+      autoload :PodsProjectGenerator, 'cocoapods/installer/xcode/pods_project_generator'
+    end
+  end
+end

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

@@ -0,0 +1,265 @@
+module Pod
+  class Installer
+    class Xcode
+      # The {PodsProjectGenerator} handles generation of the 'Pods/Pods.xcodeproj'
+      #
+      class PodsProjectGenerator
+        require 'cocoapods/installer/xcode/pods_project_generator/target_installer'
+        require 'cocoapods/installer/xcode/pods_project_generator/pod_target_installer'
+        require 'cocoapods/installer/xcode/pods_project_generator/file_references_installer'
+        require 'cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer'
+
+        # @return [Pod::Project] the `Pods/Pods.xcodeproj` project.
+        #
+        attr_reader :project
+
+        # @return [Array<AggregateTarget>] The model representations of an
+        #         aggregation of pod targets generated for a target definition
+        #         in the Podfile.
+        #
+        attr_reader :aggregate_targets
+
+        # @return [Sandbox] The sandbox where the Pods should be installed.
+        #
+        attr_reader :sandbox
+
+        # @return [Array<PodTarget>] The model representations of pod targets.
+        #
+        attr_reader :pod_targets
+
+        # @return [Analyzer] the analyzer which provides the information about what
+        #         needs to be installed.
+        #
+        attr_reader :analysis_result
+
+        # @return [InstallationOptions] the installation options from the Podfile.
+        #
+        attr_reader :installation_options
+
+        # @return [Config] the global CocoaPods configuration.
+        #
+        attr_reader :config
+
+        # Initialize a new instance
+        #
+        # @param  [Array<AggregateTarget>] aggregate_targets     @see aggregate_targets
+        # @param  [Sandbox]                sandbox               @see sandbox
+        # @param  [Array<PodTarget>]       pod_targets           @see pod_targets
+        # @param  [Analyzer]               analysis_result       @see analysis_result
+        # @param  [InstallationOptions]    installation_options  @see installation_options
+        # @param  [Config]                 config                @see config
+        #
+        def initialize(aggregate_targets, sandbox, pod_targets, analysis_result, installation_options, config)
+          @aggregate_targets = aggregate_targets
+          @sandbox = sandbox
+          @pod_targets = pod_targets
+          @analysis_result = analysis_result
+          @installation_options = installation_options
+          @config = config
+        end
+
+        def generate!
+          prepare
+          install_file_references
+          install_libraries
+          set_target_dependencies
+        end
+
+        def write
+          UI.message "- Writing Xcode project file to #{UI.path sandbox.project_path}" do
+            project.pods.remove_from_project if project.pods.empty?
+            project.development_pods.remove_from_project if project.development_pods.empty?
+            project.sort(:groups_position => :below)
+            if installation_options.deterministic_uuids?
+              UI.message('- Generating deterministic UUIDs') { project.predictabilize_uuids }
+            end
+            project.recreate_user_schemes(false)
+            project.save
+          end
+        end
+
+        # Shares schemes of development Pods.
+        #
+        # @return [void]
+        #
+        def share_development_pod_schemes
+          development_pod_targets.select(&:should_build?).each do |pod_target|
+            next unless share_scheme_for_development_pod?(pod_target.pod_name)
+            Xcodeproj::XCScheme.share_scheme(project.path, pod_target.label)
+          end
+        end
+
+        private
+
+        def create_project
+          if object_version = aggregate_targets.map(&:user_project).compact.map { |p| p.object_version.to_i }.min
+            Pod::Project.new(sandbox.project_path, false, object_version)
+          else
+            Pod::Project.new(sandbox.project_path)
+          end
+        end
+
+        # Creates the Pods project from scratch if it doesn't exists.
+        #
+        # @return [void]
+        #
+        # @todo   Clean and modify the project if it exists.
+        #
+        def prepare
+          UI.message '- Creating Pods project' do
+            @project = create_project
+            analysis_result.all_user_build_configurations.each do |name, type|
+              @project.add_build_configuration(name, type)
+            end
+
+            pod_names = pod_targets.map(&:pod_name).uniq
+            pod_names.each do |pod_name|
+              local = sandbox.local?(pod_name)
+              path = sandbox.pod_dir(pod_name)
+              was_absolute = sandbox.local_path_was_absolute?(pod_name)
+              @project.add_pod_group(pod_name, path, local, was_absolute)
+            end
+
+            if config.podfile_path
+              @project.add_podfile(config.podfile_path)
+            end
+
+            sandbox.project = @project
+            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
+            watchos_deployment_target = platforms.select { |p| p.name == :watchos }.map(&:deployment_target).min
+            tvos_deployment_target = platforms.select { |p| p.name == :tvos }.map(&:deployment_target).min
+            @project.build_configurations.each do |build_configuration|
+              build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
+              build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
+              build_configuration.build_settings['WATCHOS_DEPLOYMENT_TARGET'] = watchos_deployment_target.to_s if watchos_deployment_target
+              build_configuration.build_settings['TVOS_DEPLOYMENT_TARGET'] = tvos_deployment_target.to_s if tvos_deployment_target
+              build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
+              build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
+              build_configuration.build_settings['CODE_SIGNING_REQUIRED'] = 'NO'
+              build_configuration.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = 'NO_SIGNING/'
+            end
+          end
+        end
+
+        def install_file_references
+          installer = FileReferencesInstaller.new(sandbox, pod_targets, project)
+          installer.install!
+        end
+
+        def install_libraries
+          UI.message '- Installing targets' do
+            pod_targets.sort_by(&:name).each do |pod_target|
+              target_installer = PodTargetInstaller.new(sandbox, pod_target)
+              target_installer.install!
+            end
+
+            aggregate_targets.sort_by(&:name).each do |target|
+              target_installer = AggregateTargetInstaller.new(sandbox, target)
+              target_installer.install!
+            end
+
+            add_system_framework_dependencies
+          end
+        end
+
+        def add_system_framework_dependencies
+          # @TODO: Add Specs
+          pod_targets.sort_by(&:name).each do |pod_target|
+            pod_target.file_accessors.each do |file_accessor|
+              file_accessor.spec_consumer.frameworks.each do |framework|
+                if pod_target.should_build?
+                  pod_target.native_target.add_system_framework(framework)
+                end
+              end
+            end
+          end
+        end
+
+        # Adds a target dependency for each pod spec to each aggregate target and
+        # links the pod targets among each other.
+        #
+        # @return [void]
+        #
+        def set_target_dependencies
+          frameworks_group = 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, :tv_extension, :messages_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
+
+              unless pod_target.should_build?
+                pod_target.resource_bundle_targets.each do |resource_bundle_target|
+                  aggregate_target.native_target.add_dependency(resource_bundle_target)
+                end
+
+                next
+              end
+
+              aggregate_target.native_target.add_dependency(pod_target.native_target)
+              configure_app_extension_api_only_for_target(pod_target) if is_app_extension
+
+              pod_target.dependent_targets.each do |pod_dependency_target|
+                next unless pod_dependency_target.should_build?
+                pod_target.native_target.add_dependency(pod_dependency_target.native_target)
+                configure_app_extension_api_only_for_target(pod_dependency_target) if is_app_extension
+
+                if pod_target.requires_frameworks?
+                  product_ref = frameworks_group.files.find { |f| f.path == pod_dependency_target.product_name } ||
+                    frameworks_group.new_product_ref_for_target(pod_dependency_target.product_basename, pod_dependency_target.product_type)
+                  pod_target.native_target.frameworks_build_phase.add_file_reference(product_ref, true)
+                end
+              end
+            end
+          end
+        end
+
+        # @param  [String] pod The root name of the development pod.
+        #
+        # @return [Bool] whether the scheme for the given development pod should be
+        #         shared.
+        #
+        def share_scheme_for_development_pod?(pod)
+          case dev_pods_to_share = installation_options.share_schemes_for_development_pods
+          when TrueClass, FalseClass, NilClass
+            dev_pods_to_share
+          when Array
+            dev_pods_to_share.any? { |dev_pod| dev_pod === pod } # rubocop:disable Style/CaseEquality
+          else
+            raise Informative, 'Unable to handle share_schemes_for_development_pods ' \
+              "being set to #{dev_pods_to_share.inspect} -- please set it to true, " \
+              'false, or an array of pods to share schemes for.'
+          end
+        end
+
+        # @return [Array<Library>] The targets of the development pods generated by
+        #         the installation process.
+        #
+        def development_pod_targets
+          pod_targets.select do |pod_target|
+            sandbox.development_pods.keys.include?(pod_target.pod_name)
+          end
+        end
+
+        #------------------------------------------------------------------------#
+
+        # @! group Private Helpers
+
+        private
+
+        # Sets the APPLICATION_EXTENSION_API_ONLY build setting to YES for all
+        # configurations of the given target
+        #
+        def configure_app_extension_api_only_for_target(target)
+          target.native_target.build_configurations.each do |config|
+            config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'YES'
+          end
+        end
+      end
+    end
+  end
+end