cocoapods 0.33.1 → 0.34.0.rc1

data/lib/cocoapods/installer/target_installer/aggregate_target_installer.rb

@@ -1,11 +1,9 @@
 module Pod
   class Installer
-
     # Creates the targets which aggregate the Pods libraries in the Pods
     # project and the relative support files.
     #
     class AggregateTargetInstaller < TargetInstaller
-
       # Creates the target in the Pods project and the relative support files.
       #
       # @return [void]
@@ -13,6 +11,7 @@ module Pod
       def install!
         UI.message "- Installing target `#{library.name}` #{library.platform}" do
           add_target
+          create_support_files_dir
           create_suport_files_group
           create_xcconfig_file
           create_target_environment_header
@@ -27,21 +26,30 @@ module Pod
 
       private
 
+      # Creates the group that holds the references to the support files
+      # generated by this installer.
+      #
+      # @return [void]
+      #
+      def create_suport_files_group
+        parent = project.support_files_group
+        name = library.name
+        dir = library.support_files_dir
+        @support_files_group = parent.new_group(name, dir)
+      end
+
       # Generates the contents of the xcconfig file and saves it to disk.
       #
       # @return [void]
       #
       def create_xcconfig_file
-        path = library.xcconfig_path
-        UI.message "- Generating xcconfig file at #{UI.path(path)}" do
-          gen = Generator::XCConfig::AggregateXCConfig.new(library)
+        target.build_configurations.each do |configuration|
+          path = library.xcconfig_path(configuration.name)
+          gen = Generator::XCConfig::AggregateXCConfig.new(library, configuration.name)
           gen.save_as(path)
-          library.xcconfig = gen.xcconfig
+          library.xcconfigs[configuration.name] = gen.xcconfig
           xcconfig_file_ref = add_file_to_support_group(path)
-
-          target.build_configurations.each do |c|
-            c.base_configuration_reference = xcconfig_file_ref
-          end
+          configuration.base_configuration_reference = xcconfig_file_ref
         end
       end
 
@@ -50,11 +58,9 @@ module Pod
       #
       def create_target_environment_header
         path = library.target_environment_header_path
-        UI.message "- Generating target environment header at #{UI.path(path)}" do
-          generator = Generator::TargetEnvironmentHeader.new(library.pod_targets.map { |l| l.specs }.flatten)
-          generator.save_as(path)
-          add_file_to_support_group(path)
-        end
+        generator = Generator::TargetEnvironmentHeader.new(library.specs_by_build_configuration)
+        generator.save_as(path)
+        add_file_to_support_group(path)
       end
 
       # Generates the bridge support metadata if requested by the {Podfile}.
@@ -68,13 +74,11 @@ module Pod
       def create_bridge_support_file
         if target_definition.podfile.generate_bridge_support?
           path = library.bridge_support_path
-          UI.message "- Generating BridgeSupport metadata at #{UI.path(path)}" do
-            headers = target.headers_build_phase.files.map { |bf| sandbox.root + bf.file_ref.path }
-            generator = Generator::BridgeSupport.new(headers)
-            generator.save_as(path)
-            add_file_to_support_group(path)
-            @bridge_support_file = path.relative_path_from(sandbox.root)
-          end
+          headers = target.headers_build_phase.files.map { |bf| sandbox.root + bf.file_ref.path }
+          generator = Generator::BridgeSupport.new(headers)
+          generator.save_as(path)
+          add_file_to_support_group(path)
+          @bridge_support_file = path.relative_path_from(sandbox.root)
         end
       end
 
@@ -88,18 +92,16 @@ module Pod
       #
       def create_copy_resources_script
         path = library.copy_resources_script_path
-        UI.message "- Generating copy resources script at #{UI.path(path)}" do
-          file_accessors = library.pod_targets.map(&:file_accessors).flatten
-          resource_paths = file_accessors.map { |accessor| accessor.resources.flatten.map { |res| res.relative_path_from(project.path.dirname) }}.flatten
-          resource_bundles = file_accessors.map { |accessor| accessor.resource_bundles.keys.map {|name| "${BUILT_PRODUCTS_DIR}/#{name}.bundle" } }.flatten
-          resources = []
-          resources.concat(resource_paths)
-          resources.concat(resource_bundles)
-          resources << bridge_support_file if bridge_support_file
-          generator = Generator::CopyResourcesScript.new(resources, library.platform)
-          generator.save_as(path)
-          add_file_to_support_group(path)
-        end
+        file_accessors = library.pod_targets.map(&:file_accessors).flatten
+        resource_paths = file_accessors.map { |accessor| accessor.resources.flatten.map { |res| res.relative_path_from(project.path.dirname) } }.flatten
+        resource_bundles = file_accessors.map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{name}.bundle" } }.flatten
+        resources = []
+        resources.concat(resource_paths)
+        resources.concat(resource_bundles)
+        resources << bridge_support_file if bridge_support_file
+        generator = Generator::CopyResourcesScript.new(resources, library.platform)
+        generator.save_as(path)
+        add_file_to_support_group(path)
       end
 
       # Generates the acknowledgement files (markdown and plist) for the target.
@@ -110,12 +112,10 @@ module Pod
         basepath = library.acknowledgements_basepath
         Generator::Acknowledgements.generators.each do |generator_class|
           path = generator_class.path_from_basepath(basepath)
-          UI.message "- Generating acknowledgements at #{UI.path(path)}" do
-            file_accessors = library.pod_targets.map(&:file_accessors).flatten
-            generator = generator_class.new(file_accessors)
-            generator.save_as(path)
-            add_file_to_support_group(path)
-          end
+          file_accessors = library.pod_targets.map(&:file_accessors).flatten
+          generator = generator_class.new(file_accessors)
+          generator.save_as(path)
+          add_file_to_support_group(path)
         end
       end
 
@@ -127,7 +127,6 @@ module Pod
       attr_reader :bridge_support_file
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

data/lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -1,11 +1,9 @@
 module Pod
   class Installer
-
     # Creates the target for the Pods libraries in the Pods project and the
     # relative support files.
     #
     class PodTargetInstaller < TargetInstaller
-
       # Creates the target in the Pods project and the relative support files.
       #
       # @return [void]
@@ -13,6 +11,7 @@ module Pod
       def install!
         UI.message "- Installing target `#{library.name}` #{library.platform}" do
           add_target
+          create_support_files_dir
           add_files_to_build_phases
           add_resources_bundle_targets
           create_xcconfig_file
@@ -34,17 +33,15 @@ module Pod
       # @return [void]
       #
       def add_files_to_build_phases
-        UI.message "- Adding Build files" do
-          library.file_accessors.each do |file_accessor|
-            consumer = file_accessor.spec_consumer
-            flags = compiler_flags_for_consumer(consumer)
-            all_source_files = file_accessor.source_files
-            regular_source_files = all_source_files.reject { |sf| sf.extname == ".d" }
-            regular_file_refs = regular_source_files.map { |sf| project.reference_for_path(sf) }
-            target.add_file_references(regular_file_refs, flags)
-            other_file_refs = (all_source_files - regular_source_files).map { |sf| project.reference_for_path(sf) }
-            target.add_file_references(other_file_refs, nil)
-          end
+        library.file_accessors.each do |file_accessor|
+          consumer = file_accessor.spec_consumer
+          flags = compiler_flags_for_consumer(consumer)
+          all_source_files = file_accessor.source_files
+          regular_source_files = all_source_files.reject { |sf| sf.extname == '.d' }
+          regular_file_refs = regular_source_files.map { |sf| project.reference_for_path(sf) }
+          target.add_file_references(regular_file_refs, flags)
+          other_file_refs = (all_source_files - regular_source_files).map { |sf| project.reference_for_path(sf) }
+          target.add_file_references(other_file_refs, nil)
         end
       end
 
@@ -56,24 +53,22 @@ module Pod
       # @return [void]
       #
       def add_resources_bundle_targets
-        UI.message "- Adding resource bundles to Pods project" do
-          library.file_accessors.each do |file_accessor|
-            file_accessor.resource_bundles.each do |bundle_name, paths|
-              # Add a dependency on an existing Resource Bundle target if possible
-              if bundle_target = project.targets.detect { |target| target.name == bundle_name }
-                target.add_dependency(bundle_target)
-                next
-              end
-              file_references = paths.map { |sf| project.reference_for_path(sf) }
-              bundle_target = project.new_resources_bundle(bundle_name, file_accessor.spec_consumer.platform_name)
-              bundle_target.add_resources(file_references)
-
-              library.user_build_configurations.each do |bc_name, type|
-                bundle_target.add_build_configuration(bc_name, type)
-              end
-
+        library.file_accessors.each do |file_accessor|
+          file_accessor.resource_bundles.each do |bundle_name, paths|
+            # Add a dependency on an existing Resource Bundle target if possible
+            if bundle_target = project.targets.find { |target| target.name == bundle_name }
               target.add_dependency(bundle_target)
+              next
+            end
+            file_references = paths.map { |sf| project.reference_for_path(sf) }
+            bundle_target = project.new_resources_bundle(bundle_name, file_accessor.spec_consumer.platform_name)
+            bundle_target.add_resources(file_references)
+
+            library.user_build_configurations.each do |bc_name, type|
+              bundle_target.add_build_configuration(bc_name, type)
             end
+
+            target.add_dependency(bundle_target)
           end
         end
       end
@@ -85,20 +80,16 @@ module Pod
       def create_xcconfig_file
         path = library.xcconfig_path
         public_gen = Generator::XCConfig::PublicPodXCConfig.new(library)
-        UI.message "- Generating public xcconfig file at #{UI.path(path)}" do
-          public_gen.save_as(path)
-          add_file_to_support_group(path)
-        end
+        public_gen.save_as(path)
+        add_file_to_support_group(path)
 
         path = library.xcconfig_private_path
         private_gen = Generator::XCConfig::PrivatePodXCConfig.new(library, public_gen.xcconfig)
-        UI.message "- Generating private xcconfig file at #{UI.path(path)}" do
-          private_gen.save_as(path)
-          xcconfig_file_ref = add_file_to_support_group(path)
+        private_gen.save_as(path)
+        xcconfig_file_ref = add_file_to_support_group(path)
 
-          target.build_configurations.each do |c|
-            c.base_configuration_reference = xcconfig_file_ref
-          end
+        target.build_configurations.each do |c|
+          c.base_configuration_reference = xcconfig_file_ref
         end
       end
 
@@ -110,22 +101,20 @@ module Pod
       #
       def create_prefix_header
         path = library.prefix_header_path
-        UI.message "- Generating prefix header at #{UI.path(path)}" do
-          generator = Generator::PrefixHeader.new(library.file_accessors, library.platform)
-          generator.imports << library.target_environment_header_path.basename
-          generator.save_as(path)
-          add_file_to_support_group(path)
-
-          target.build_configurations.each do |c|
-            relative_path = path.relative_path_from(sandbox.root)
-            c.build_settings['GCC_PREFIX_HEADER'] = relative_path.to_s
-          end
+        generator = Generator::PrefixHeader.new(library.file_accessors, library.platform)
+        generator.imports << library.target_environment_header_path.basename
+        generator.save_as(path)
+        add_file_to_support_group(path)
+
+        target.build_configurations.each do |c|
+          relative_path = path.relative_path_from(project.path.dirname)
+          c.build_settings['GCC_PREFIX_HEADER'] = relative_path.to_s
         end
       end
 
       ENABLE_OBJECT_USE_OBJC_FROM = {
         :ios => Version.new('6'),
-        :osx => Version.new('10.8')
+        :osx => Version.new('10.8'),
       }
 
       # Returns the compiler flags for the source files of the given specification.
@@ -174,9 +163,9 @@ module Pod
           end
         end
         if target_definition.inhibits_warnings_for_pod?(consumer.spec.root.name)
-          flags << '-w -Xanalyzer -analyzer-disable-checker'
+          flags << '-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode'
         end
-        flags * " "
+        flags * ' '
       end
 
       # Adds a reference to the given file in the support group of this target.
@@ -188,12 +177,12 @@ module Pod
       #
       def add_file_to_support_group(path)
         pod_name = library.pod_name
-        group = project.pod_support_files_group(pod_name)
+        dir = library.support_files_dir
+        group = project.pod_support_files_group(pod_name, dir)
         group.new_file(path)
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -6,13 +6,11 @@ require 'active_support/core_ext/array/conversions'
 
 module Pod
   class Installer
-
     # The {UserProjectIntegrator} integrates the libraries generated by
     # TargetDefinitions of the {Podfile} with their correspondent user
     # projects.
     #
     class UserProjectIntegrator
-
       autoload :TargetIntegrator, 'cocoapods/installer/user_project_integrator/target_integrator'
 
       # @return [Podfile] the podfile that should be integrated with the user
@@ -62,6 +60,7 @@ module Pod
         create_workspace
         integrate_user_targets
         warn_about_empty_podfile
+        warn_about_xcconfig_overrides
       end
 
       #-----------------------------------------------------------------------#
@@ -128,8 +127,30 @@ module Pod
       # @return [void]
       #
       def warn_about_empty_podfile
-        if podfile.target_definitions.values.all?{ |td| td.empty? }
-          UI.warn "[!] The Podfile does not contain any dependencies."
+        if podfile.target_definitions.values.all?(&:empty?)
+          UI.warn '[!] The Podfile does not contain any dependencies.'
+        end
+      end
+
+      # Checks whether the settings of the CocoaPods generated xcconfig are
+      # overridden by the build configuration of a target and prints a
+      # warning to inform the user if needed.
+      #
+      def warn_about_xcconfig_overrides
+        targets.each do |aggregate_target|
+          aggregate_target.user_targets.each do |user_target|
+            user_target.build_configurations.each do |config|
+              xcconfig = aggregate_target.xcconfigs[config.name]
+              if xcconfig
+                xcconfig.to_hash.keys.each do |key|
+                  target_value = config.build_settings[key]
+                  if target_value && !target_value.include?('$(inherited)')
+                    print_override_warning(aggregate_target, user_target, config, key)
+                  end
+                end
+              end
+            end
+          end
         end
       end
 
@@ -152,7 +173,7 @@ module Pod
           project = user_project_paths.first.basename('.xcodeproj')
           installation_root + "#{project}.xcworkspace"
         else
-          raise Informative, "Could not automatically select an Xcode " \
+          raise Informative, 'Could not automatically select an Xcode ' \
             "workspace. Specify one in your Podfile like so:\n\n"       \
             "    workspace 'path/to/Workspace.xcworkspace'\n"
         end
@@ -164,18 +185,41 @@ module Pod
       # @note   Empty target definitions are ignored.
       #
       def user_project_paths
-        targets.map do |target|
-          target.user_project_path
-        end.compact.uniq
+        targets.map(&:user_project_path).compact.uniq
       end
 
-
       def targets_to_integrate
         targets.reject { |target| target.target_definition.empty? }
       end
 
-      #-----------------------------------------------------------------------#
+      # Prints a warning informing the user that a build configuration of
+      # the integrated target is overriding the CocoaPods build settings.
+      #
+      # @param  [Target::AggregateTarget] aggregate_target
+      #         The umbrella target.
+      #
+      # @param  [XcodeProj::PBXNativeTarget] user_target
+      #         The native target.
+      #
+      # @param  [Xcodeproj::XCBuildConfiguration] config
+      #         The build configuration.
+      #
+      # @param  [String] key
+      #         The key of the overridden build setting.
+      #
+      def print_override_warning(aggregate_target, user_target, config, key)
+        actions = [
+          'Use the `$(inherited)` flag, or',
+          'Remove the build settings from the target.',
+        ]
+        message = "The `#{user_target.name} [#{config.name}]` " \
+          "target overrides the `#{key}` build setting defined in " \
+          "`#{aggregate_target.xcconfig_relative_path(config.name)}'. " \
+          'This can lead to problems with the CocoaPods installation'
+        UI.warn(message, actions)
+      end
 
+      #-----------------------------------------------------------------------#
     end
   end
 end

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

@@ -3,11 +3,11 @@ require 'active_support/core_ext/string/inflections'
 module Pod
   class Installer
     class UserProjectIntegrator
-
       # This class is responsible for integrating the library generated by a
       # {TargetDefinition} with its destination project.
       #
       class TargetIntegrator
+        autoload :XCConfigIntegrator, 'cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator'
 
         # @return [Target] the target that should be integrated.
         #
@@ -26,54 +26,17 @@ module Pod
         # @return [void]
         #
         def integrate!
-          return if native_targets.empty?
           UI.section(integration_message) do
-            add_xcconfig_base_configuration
-            add_pods_library
-            add_copy_resources_script_phase
-            add_check_manifest_lock_script_phase
-            user_project.save
-          end
-        end
+            XCConfigIntegrator.integrate(target, native_targets)
+            update_to_cocoapods_0_34
 
-        # @return [Array<PBXNativeTarget>] the user targets for integration.
-        #
-        def native_targets
-          unless @native_targets
-            target_uuids = target.user_target_uuids
-            native_targets = target_uuids.map do |uuid|
-              native_target = user_project.objects_by_uuid[uuid]
-              unless native_target
-                raise Informative, "[Bug] Unable to find the target with " \
-                  "the `#{uuid}` UUID for the `#{target}` integration library"
-              end
-              native_target
+            unless native_targets_to_integrate.empty?
+              add_pods_library
+              add_copy_resources_script_phase
+              add_check_manifest_lock_script_phase
             end
-            non_integrated = native_targets.reject do |native_target|
-              native_target.frameworks_build_phase.files.any? do |build_file|
-                file_ref = build_file.file_ref
-                file_ref &&
-                  file_ref.isa == 'PBXFileReference' &&
-                  file_ref.display_name == target.product_name
-              end
-            end
-            @native_targets = non_integrated
+            user_project.save
           end
-          @native_targets
-        end
-
-        # Read the project from the disk to ensure that it is up to date as
-        # other TargetIntegrators might have modified it.
-        #
-        def user_project
-          @user_project ||= Xcodeproj::Project.open(target.user_project_path)
-        end
-
-        # Read the pods project from the disk to ensure that it is up to date as
-        # other TargetIntegrators might have modified it.
-        #
-        def pods_project
-          @pods_project ||= Xcodeproj::Project.open(target.sandbox.project_path)
         end
 
         # @return [String] a string representation suitable for debugging.
@@ -82,39 +45,25 @@ module Pod
           "#<#{self.class} for target `#{target.label}'>"
         end
 
-        #---------------------------------------------------------------------#
-
-        # @!group Integration steps
-
         private
 
-        # @return [Specification::Consumer] the consumer for the specifications.
-        #
-        def spec_consumers
-          @spec_consumers ||= target.pod_targets.map(&:file_accessors).flatten.map(&:spec_consumer)
-        end
+        # @!group Integration steps
+        #---------------------------------------------------------------------#
 
-        # Adds the `xcconfig` configurations files generated for the current
-        # {TargetDefinition} to the build configurations of the targets that
-        # should be integrated.
-        #
-        # @note   It also checks if any build setting of the build
-        #         configurations overrides the `xcconfig` file and warns the
-        #         user.
+        # Fixes the paths of the copy resource scripts.
         #
-        # @todo   If the xcconfig is already set don't override it and inform
-        #         the user.
+        # @todo   This can be removed for CocoaPods 1.0
         #
-        # @return [void]
-        #
-        def add_xcconfig_base_configuration
-          xcconfig = user_project.files.select { |f| f.path == target.xcconfig_relative_path }.first ||
-                     user_project.new_file(target.xcconfig_relative_path)
-          native_targets.each do |native_target|
-            check_overridden_build_settings(target.xcconfig, native_target)
-            native_target.build_configurations.each do |config|
-              config.base_configuration_reference = xcconfig
+        def update_to_cocoapods_0_34
+          phases = native_targets.map do |target|
+            target.shell_script_build_phases.select do |bp|
+              bp.name == 'Copy Pods Resources'
             end
+          end.flatten
+
+          script_path = target.copy_resources_script_relative_path
+          phases.each do |phase|
+            phase.shell_script = %("#{script_path}"\n)
           end
         end
 
@@ -127,11 +76,11 @@ module Pod
         #
         def add_pods_library
           frameworks = user_project.frameworks_group
-          native_targets.each do |native_target|
+          native_targets_to_integrate.each do |native_target|
             library = frameworks.files.select { |f| f.path == target.product_name }.first ||
                       frameworks.new_product_ref_for_target(target.name, :static_library)
             unless native_target.frameworks_build_phase.files_references.include?(library)
-                   native_target.frameworks_build_phase.add_file_reference(library)
+              native_target.frameworks_build_phase.add_file_reference(library)
             end
           end
         end
@@ -143,12 +92,12 @@ module Pod
         # @return [void]
         #
         def add_copy_resources_script_phase
-          phase_name = "Copy Pods Resources"
-          native_targets.each do |native_target|
-            phase = native_target.shell_script_build_phases.select { |bp| bp.name == phase_name }.first ||
-                    native_target.new_shell_script_build_phase(phase_name)
-            path  = target.copy_resources_script_relative_path
-            phase.shell_script = %{"#{path}"\n}
+          phase_name = 'Copy Pods Resources'
+          native_targets_to_integrate.each do |native_target|
+            phase = native_target.shell_script_build_phases.select { |bp| bp.name == phase_name }.first
+            phase ||= native_target.new_shell_script_build_phase(phase_name)
+            script_path = target.copy_resources_script_relative_path
+            phase.shell_script = %("#{script_path}"\n)
             phase.show_env_vars_in_log = '0'
           end
         end
@@ -164,7 +113,7 @@ module Pod
         #
         def add_check_manifest_lock_script_phase
           phase_name = 'Check Pods Manifest.lock'
-          native_targets.each do |native_target|
+          native_targets_to_integrate.each do |native_target|
             next if native_target.shell_script_build_phases.any? { |phase| phase.name == phase_name }
             phase = native_target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
             native_target.build_phases.unshift(phase)
@@ -182,56 +131,56 @@ module Pod
           end
         end
 
-        #---------------------------------------------------------------------#
-
-        # @!group Private helpers.
-
         private
 
-        # Informs the user about any build setting of the target which might
-        # override the given xcconfig file.
-        #
-        # @return [void]
-        #
-        def check_overridden_build_settings(xcconfig, native_target)
-          return unless xcconfig
+        # @!group Private helpers
+        #---------------------------------------------------------------------#
 
-          configs_by_overridden_key = {}
-          native_target.build_configurations.each do |config|
-            xcconfig.attributes.keys.each do |key|
-              target_value = config.build_settings[key]
+        # @return [Array<PBXNativeTarget>] The list of all the targets that
+        #         match the given target.
+        #
+        def native_targets
+          @native_targets ||= target.user_targets(user_project)
+        end
 
-              if target_value && !target_value.include?('$(inherited)')
-                configs_by_overridden_key[key] ||= []
-                configs_by_overridden_key[key] << config.name
+        # @return [Array<PBXNativeTarget>] The list of the targets
+        #         that have not been integrated by past installations
+        #         of
+        #
+        def native_targets_to_integrate
+          unless @native_targets_to_integrate
+            @native_targets_to_integrate = native_targets.reject do |native_target|
+              native_target.frameworks_build_phase.files.any? do |build_file|
+                file_ref = build_file.file_ref
+                file_ref &&
+                  file_ref.isa == 'PBXFileReference' &&
+                  file_ref.display_name == target.product_name
               end
             end
-
-            configs_by_overridden_key.each do |key, config_names|
-              name    = "#{native_target.name} [#{config_names.join(' - ')}]"
-              actions = [
-                "Use the `$(inherited)` flag, or",
-                "Remove the build settings from the target."
-              ]
-              UI.warn("The target `#{name}` overrides the `#{key}` build " \
-                      "setting defined in `#{target.xcconfig_relative_path}'.",
-                      actions)
-            end
           end
+          @native_targets_to_integrate
+        end
+
+        # Read the project from the disk to ensure that it is up to date as
+        # other TargetIntegrators might have modified it.
+        #
+        def user_project
+          @user_project ||= Xcodeproj::Project.open(target.user_project_path)
+        end
+
+        # @return [Specification::Consumer] the consumer for the specifications.
+        #
+        def spec_consumers
+          @spec_consumers ||= target.pod_targets.map(&:file_accessors).flatten.map(&:spec_consumer)
         end
 
         # @return [String] the message that should be displayed for the target
         #         integration.
         #
         def integration_message
-          "Integrating Pod #{'target'.pluralize(target.pod_targets.size)} " \
-            "`#{target.pod_targets.map(&:name).to_sentence}` " \
-            "into aggregate target #{target.name} " \
-            "of project #{UI.path target.user_project_path}."
+          "Integrating target `#{target.name}` " \
+            "(#{UI.path target.user_project_path} project)"
         end
-
-        #---------------------------------------------------------------------#
-
       end
     end
   end