cocoapods 0.37.2 → 0.38.0.beta.1

data/lib/cocoapods/command/outdated.rb

@@ -8,15 +8,6 @@ module Pod
         spec repos, not those from local/external sources or `:head` versions.
       DESC
 
-      def self.options
-        [['--no-repo-update', 'Skip running `pod repo update` before install']].concat(super)
-      end
-
-      def initialize(argv)
-        config.skip_repo_update = !argv.flag?('repo-update', !config.skip_repo_update)
-        super
-      end
-
       # Run the command
       #
       # @todo the command report new dependencies added to the Podfile as
@@ -98,7 +89,7 @@ module Pod
 
       def spec_sets
         @spec_sets ||= begin
-          analyzer.send(:update_repositories_if_needed)
+          analyzer.send(:update_repositories) unless config.skip_repo_update?
           aggregate = Source::Aggregate.new(analyzer.sources.map(&:repo))
           installed_pods.map do |pod_name|
             aggregate.search(Dependency.new(pod_name))

data/lib/cocoapods/command/project.rb

@@ -134,8 +134,9 @@ module Pod
           verify_lockfile_exists!
 
           # Check if all given pods are installed
-          missing_pods = @pods.select do |pod|
-            !config.lockfile.pod_names.include?(pod)
+          lockfile_roots = config.lockfile.pod_names.map { |p| Specification.root_name(p) }
+          missing_pods = @pods.map { |p| Specification.root_name(p) }.select do |pod|
+            !lockfile_roots.include?(pod)
           end
 
           if missing_pods.length > 0

data/lib/cocoapods/command/spec.rb

@@ -30,23 +30,6 @@ module Pod
         help! 'A valid regular expression is required.'
       end
 
-      # @return [Fixnum] the index of the chosen array item
-      #
-      def choose_from_array(array, message)
-        array.each_with_index do |item, index|
-          UI.puts "#{ index + 1 }: #{ item }"
-        end
-
-        UI.puts message
-
-        index = UI.gets.chomp.to_i - 1
-        if index < 0 || index > array.count - 1
-          raise Informative, "#{ index + 1 } is invalid [1-#{ array.count }]"
-        else
-          index
-        end
-      end
-
       # @param  [String] spec
       #         The name of the specification.
       #

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

@@ -37,7 +37,7 @@ module Pod
           query = @use_regex ? @query : Regexp.escape(@query)
           filepath = if @show_all
                        specs = get_path_of_spec(query, @show_all).split(/\n/)
-                       index = choose_from_array(specs, "Which spec would you like to print [1-#{ specs.count }]? ")
+                       index = UI.choose_from_array(specs, "Which spec would you like to print [1-#{ specs.count }]? ")
                        specs[index]
                      else
                        get_path_of_spec(query)

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

@@ -177,6 +177,7 @@ Pod::Spec.new do |s|
   #  When using multiple platforms
   # s.ios.deployment_target = "5.0"
   # s.osx.deployment_target = "10.7"
+  # s.watchos.deployment_target = "2.0"
 
 
   # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

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

@@ -38,7 +38,7 @@ module Pod
           if @show_all
             specs = get_path_of_spec(query, @show_all).split(/\n/)
             message = "Which spec would you like to edit [1-#{specs.count}]? "
-            index = choose_from_array(specs, message)
+            index = UI.choose_from_array(specs, message)
             filepath = specs[index]
           else
             filepath = get_path_of_spec(query)

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

@@ -42,7 +42,7 @@ module Pod
 
         def run
           UI.puts
-          invalid_count = 0
+          failure_reasons = []
           podspecs_to_lint.each do |podspec|
             validator                = Validator.new(podspec, @source_urls)
             validator.quick          = @quick
@@ -53,7 +53,7 @@ module Pod
             validator.only_subspec   = @only_subspec
             validator.use_frameworks = @use_frameworks
             validator.validate
-            invalid_count += 1 unless validator.validated?
+            failure_reasons << validator.failure_reason
 
             unless @clean
               UI.puts "Pods project available at `#{validator.validation_dir}/Pods/Pods.xcodeproj` for inspection."
@@ -63,11 +63,17 @@ module Pod
 
           count = podspecs_to_lint.count
           UI.puts "Analyzed #{count} #{'podspec'.pluralize(count)}.\n\n"
-          if invalid_count == 0
+
+          failure_reasons.compact!
+          if failure_reasons.empty?
             lint_passed_message = count == 1 ? "#{podspecs_to_lint.first.basename} passed validation." : 'All the specs passed validation.'
             UI.puts lint_passed_message.green << "\n\n"
           else
-            raise Informative, count == 1 ? 'The spec did not pass validation.' : "#{invalid_count} out of #{count} specs failed validation."
+            raise Informative, if count == 1
+                                 "The spec did not pass validation, due to #{failure_reasons.first}."
+                               else
+                                 "#{invalid_count} out of #{count} specs failed validation."
+                               end
           end
           podspecs_tmp_dir.rmtree if podspecs_tmp_dir.exist?
         end

data/lib/cocoapods/config.rb

@@ -19,6 +19,7 @@ module Pod
 
       :clean               => true,
       :integrate_targets   => true,
+      :deduplicate_targets => true,
       :lock_pod_source     => true,
       :new_version_message => ENV['COCOAPODS_SKIP_UPDATE_MESSAGE'].nil?,
 
@@ -89,6 +90,11 @@ module Pod
     attr_accessor :integrate_targets
     alias_method :integrate_targets?, :integrate_targets
 
+    # @return [Bool] Whether CocoaPods should deduplicate pod targets.
+    #
+    attr_accessor :deduplicate_targets
+    alias_method :deduplicate_targets?, :deduplicate_targets
+
     # @return [Bool] Whether the installer should skip the repos update.
     #
     attr_accessor :skip_repo_update

data/lib/cocoapods/downloader/cache.rb

@@ -19,7 +19,7 @@ module Pod
       #
       def initialize(root)
         @root = Pathname(root)
-        @root.mkpath
+        ensure_matching_version
       end
 
       # Downloads the Pod from the given `request`
@@ -38,8 +38,54 @@ module Pod
         raise
       end
 
+      # @return [Hash<String, Hash<Symbol, String>>]
+      #         A hash whose keys are the pod name
+      #         And values are a hash with the following keys:
+      #         :spec_file : path to the spec file
+      #         :name      : name of the pod
+      #         :version   : pod version
+      #         :release   : boolean to tell if that's a release pod
+      #         :slug      : the slug path where the pod cache is located
+      #
+      def cache_descriptors_per_pod
+        specs_dir = root + 'Specs'
+        release_specs_dir = specs_dir + 'Release'
+        return {} unless specs_dir.exist?
+
+        spec_paths = specs_dir.find.select { |f| f.fnmatch('*.podspec.json') }
+        spec_paths.reduce({}) do |hash, spec_path|
+          spec = Specification.from_file(spec_path)
+          hash[spec.name] ||= []
+          is_release = spec_path.to_s.start_with?(release_specs_dir.to_s)
+          request = Downloader::Request.new(:spec => spec, :released => is_release)
+          hash[spec.name] << {
+            :spec_file => spec_path,
+            :name => spec.name,
+            :version => spec.version,
+            :release => is_release,
+            :slug => root + request.slug,
+          }
+          hash
+        end
+      end
+
       private
 
+      # Ensures the cache on disk was created with the same CocoaPods version as
+      # is currently running.
+      #
+      # @return [Void]
+      #
+      def ensure_matching_version
+        version_file = root + 'VERSION'
+        version = version_file.read.strip if version_file.file?
+
+        root.rmtree if version != Pod::VERSION && root.exist?
+        root.mkpath
+
+        version_file.open('w') { |f| f << Pod::VERSION }
+      end
+
       # @param  [Request] request
       #         the request to be downloaded.
       #
@@ -105,6 +151,7 @@ module Pod
       def uncached_pod(request)
         in_tmpdir do |target|
           result, podspecs = download(request, target)
+          result.location = nil
 
           podspecs.each do |name, spec|
             destination = path_for_pod(request, :name => name, :params => result.checkout_options)

data/lib/cocoapods/executable.rb

@@ -64,7 +64,7 @@ module Pod
       end
 
       status = popen3(bin, command, stdout, stderr)
-      output = stdout.join("\n") + stderr.join("\n")
+      output = stdout.join + stderr.join
       unless status.success?
         if raise_on_failure
           raise Informative, "#{full_command}\n\n#{output}"
@@ -80,19 +80,41 @@ module Pod
     def self.popen3(bin, command, stdout, stderr)
       require 'open3'
       Open3.popen3(bin, *command) do |i, o, e, t|
-        Thread.new { while s = o.gets; stdout << s; end }
-        Thread.new { while s = e.gets; stderr << s; end }
+        reader(o, stdout)
+        reader(e, stderr)
         i.close
+
         status = t.value
 
         o.flush
         e.flush
-        sleep(0.1)
+        sleep(0.01)
 
         status
       end
     end
 
+    def self.reader(input, output)
+      Thread.new do
+        buf = ''
+        begin
+          loop do
+            buf << input.readpartial(4096)
+            loop do
+              string, separator, buf = buf.partition(/[\r\n]/)
+              if separator.empty?
+                buf = string
+                break
+              end
+              output << (string << separator)
+            end
+          end
+        rescue EOFError
+          output << (buf << $/) unless buf.empty?
+        end
+      end
+    end
+
     #-------------------------------------------------------------------------#
 
     # Helper class that allows to write to an {IO} instance taking into account
@@ -125,8 +147,7 @@ module Pod
       #
       def <<(value)
         super
-      ensure
-        @io << "#{ indent }#{ value }" if @io
+        io << "#{ indent }#{ value }" if io
       end
     end
   end

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -51,6 +51,7 @@ module Pod
       EXTERNAL_STRINGS_FILE_MIMINUM_DEPLOYMENT_TARGET = {
         :ios => Version.new('6.0'),
         :osx => Version.new('10.8'),
+        :watchos => Version.new('2.0'),
       }
 
       # @return [Bool] Whether the external strings file is supported by the

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -1,24 +1,15 @@
 module Pod
   module Generator
     class EmbedFrameworksScript
-      # @return [TargetDefinition] The target definition, whose label will be
-      #         used to locate the target-specific build products.
-      #
-      attr_reader :target_definition
-
-      # @return [Hash{String, Array{String}] Multiple lists of frameworks per
+      # @return [Hash{String => Array<String>}] Multiple lists of frameworks per
       #         configuration.
       #
       attr_reader :frameworks_by_config
 
-      # @param  [TargetDefinition] target_definition
-      #         @see #target_definition
-      #
-      # @param  [Hash{String, Array{String}] frameworks_by_config
+      # @param  [Hash{String => Array<String>] frameworks_by_config
       #         @see #frameworks_by_config
       #
-      def initialize(target_definition, frameworks_by_config)
-        @target_definition = target_definition
+      def initialize(frameworks_by_config)
         @frameworks_by_config = frameworks_by_config
       end
 
@@ -54,7 +45,12 @@ module Pod
 
           install_framework()
           {
-            local source="${BUILT_PRODUCTS_DIR}/#{target_definition.label}/$1"
+            if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
+              local source="${BUILT_PRODUCTS_DIR}/$1"
+            else
+              local source="${BUILT_PRODUCTS_DIR}/$(basename "$1")"
+            fi
+
             local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
             if [ -L "${source}" ]; then
@@ -63,33 +59,32 @@ module Pod
             fi
 
             # use filter instead of exclude so missing patterns dont' throw errors
-            echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers/\" --filter \"- PrivateHeaders/\" --filter \"- Modules/\" ${source} ${destination}"
-            rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers/" --filter "- PrivateHeaders/" --filter "- Modules/" "${source}" "${destination}"
+            echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" ${source} ${destination}"
+            rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
+
             # Resign the code if required by the build settings to avoid unstable apps
-            if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
-                code_sign "${destination}/$1"
-            fi
+            code_sign_if_enabled "${destination}/$(basename "$1")"
 
             # Embed linked Swift runtime libraries
             local basename
-            basename=$(echo $1 | sed -E s/\\\\..+// && exit ${PIPESTATUS[0]})
+            basename=$(basename $1 | sed -E s/\\\\..+// && exit ${PIPESTATUS[0]})
             local swift_runtime_libs
-            swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/$1/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
+            swift_runtime_libs=$(xcrun otool -LX "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/${basename}.framework/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
             for lib in $swift_runtime_libs; do
               echo "rsync -auv \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\""
               rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
-              if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
-                code_sign "${destination}/${lib}"
-              fi
+              code_sign_if_enabled "${destination}/${lib}"
             done
           }
 
           # Signs a framework with the provided identity
-          code_sign() {
-            # Use the current code_sign_identitiy
-            echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-            echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1"
-            /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
+          code_sign_if_enabled() {
+            if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+              # Use the current code_sign_identitiy
+              echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
+              echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1"
+              /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
+            fi
           }
 
         eos

data/lib/cocoapods/generator/header.rb

@@ -82,7 +82,11 @@ module Pod
       # @return [String]
       #
       def generate_platform_import_header
-        "#import #{platform == :ios ? '<UIKit/UIKit.h>' : '<Cocoa/Cocoa.h>'}\n"
+        case platform.name
+        when :ios then "#import <UIKit/UIKit.h>\n"
+        when :osx then "#import <Cocoa/Cocoa.h>\n"
+        else "#import <Foundation/Foundation.h>\n"
+        end
       end
     end
   end

data/lib/cocoapods/generator/umbrella_header.rb

@@ -18,7 +18,7 @@ module Pod
       #         @see target
       #
       def initialize(target)
-        super(target.target_definition.platform)
+        super(target.platform)
         @target = target
       end
 

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

@@ -49,26 +49,62 @@ module Pod
         # @return [Xcodeproj::Config]
         #
         def generate
-          pod_targets = target.pod_targets_for_build_configuration(@configuration_name)
           config = {
             'OTHER_LDFLAGS' => '$(inherited) ' + XCConfigHelper.default_ld_flags(target),
-            'OTHER_LIBTOOLFLAGS' => '$(OTHER_LDFLAGS)',
             'PODS_ROOT' => target.relative_pods_root,
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
           }
+          @xcconfig = Xcodeproj::Config.new(config)
+
+          @xcconfig.merge!(merged_user_target_xcconfigs)
+
+          generate_settings_to_import_pod_targets
+
+          XCConfigHelper.add_target_specific_settings(target, @xcconfig)
+
+          generate_vendored_build_settings
+          generate_other_ld_flags
+
+          # TODO: Need to decide how we are going to ensure settings like these
+          # are always excluded from the user's project.
+          #
+          # See https://github.com/CocoaPods/CocoaPods/issues/1216
+          @xcconfig.attributes.delete('USE_HEADERMAP')
+
+          generate_ld_runpath_search_paths if target.requires_frameworks?
+
+          @xcconfig
+        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
           if target.requires_frameworks?
             # Framework headers are automatically discoverable by `#import <…>`.
-            header_search_paths = pod_targets.map { |target| "$PODS_FRAMEWORK_BUILD_PATH/#{target.product_name}/Headers" }
+            header_search_paths = target.pod_targets.map do |target|
+              if target.scoped?
+                "$PODS_FRAMEWORK_BUILD_PATH/#{target.product_name}/Headers"
+              else
+                "$CONFIGURATION_BUILD_DIR/#{target.product_name}/Headers"
+              end
+            end
             build_settings = {
-              'PODS_FRAMEWORK_BUILD_PATH' => target.configuration_build_dir,
+              'PODS_FRAMEWORK_BUILD_PATH' => target.scoped_configuration_build_dir,
               # Make headers discoverable by `import "…"`
               'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-iquote'),
             }
-            if target.pod_targets.any?(&:should_build?)
+            if target.pod_targets.any? { |t| t.should_build? && t.scoped? }
               build_settings['FRAMEWORK_SEARCH_PATHS'] = '$(inherited) "$PODS_FRAMEWORK_BUILD_PATH"'
             end
-            config.merge!(build_settings)
+            @xcconfig.merge!(build_settings)
           else
             # Make headers discoverable from $PODS_ROOT/Headers directory
             header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
@@ -78,44 +114,50 @@ module Pod
               # by `#import <…>`
               'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-isystem'),
             }
-            config.merge!(build_settings)
+            @xcconfig.merge!(build_settings)
           end
+        end
 
-          @xcconfig = Xcodeproj::Config.new(config)
-
-          XCConfigHelper.add_target_specific_settings(target, @xcconfig)
-
-          pod_targets.each do |pod_target|
+        # Add custom build settings and required build settings to link to
+        # vendored libraries and frameworks.
+        #
+        # @note
+        #   In case of generated pod targets, which require frameworks, the
+        #   vendored frameworks and libraries are already linked statically
+        #   into the framework binary and must not be linked again to the
+        #   user target.
+        #
+        def generate_vendored_build_settings
+          target.pod_targets.each do |pod_target|
             unless pod_target.should_build? && pod_target.requires_frameworks?
-              # In case of generated pod targets, which require frameworks, the
-              # vendored frameworks and libraries are already linked statically
-              # into the framework binary and must not be linked again to the
-              # user target.
               XCConfigHelper.add_settings_for_file_accessors_of_target(pod_target, @xcconfig)
             end
+          end
+        end
 
-            # Add pod target to list of frameworks / libraries that are
-            # linked with the user’s project.
-            if pod_target.should_build?
-              if pod_target.requires_frameworks?
-                @xcconfig.merge!('OTHER_LDFLAGS' => %(-framework "#{pod_target.product_basename}"))
-              else
-                @xcconfig.merge!('OTHER_LDFLAGS' => %(-l "#{pod_target.product_basename}"))
-              end
+        # Add pod target to list of frameworks / libraries that are linked
+        # with the user’s project.
+        #
+        def generate_other_ld_flags
+          other_ld_flags = target.pod_targets.select(&:should_build?).map do |pod_target|
+            if pod_target.requires_frameworks?
+              %(-framework "#{pod_target.product_basename}")
+            else
+              %(-l "#{pod_target.product_basename}")
             end
           end
 
-          # TODO: Need to decide how we are going to ensure settings like these
-          # are always excluded from the user's project.
-          #
-          # See https://github.com/CocoaPods/CocoaPods/issues/1216
-          @xcconfig.attributes.delete('USE_HEADERMAP')
-
-          generate_ld_runpath_search_paths if target.requires_frameworks?
-
-          @xcconfig
+          @xcconfig.merge!('OTHER_LDFLAGS' => other_ld_flags.join(' '))
         end
 
+        # Ensure to add the default linker run path search paths as they could
+        # be not present due to being historically absent in the project or
+        # target template or just being removed by being superficial when
+        # linking third-party dependencies exclusively statically. This is not
+        # something a project needs specifically for the integration with
+        # CocoaPods, but makes sure that it is self-contained for the given
+        # constraints.
+        #
         def generate_ld_runpath_search_paths
           ld_runpath_search_paths = ['$(inherited)']
           if target.platform.symbolic_name == :osx
@@ -135,6 +177,70 @@ module Pod
           @xcconfig.merge!('LD_RUNPATH_SEARCH_PATHS' => ld_runpath_search_paths.join(' '))
         end
 
+        private
+
+        #---------------------------------------------------------------------#
+
+        # !@group Private Helpers
+
+        # Returns the {PodTarget}s which are active for the current
+        # configuration name.
+        #
+        # @return [Array<PodTarget>]
+        #
+        def pod_targets
+          target.pod_targets_for_build_configuration(@configuration_name)
+        end
+
+        # Returns the +user_target_xcconfig+ for all pod targets grouped by keys
+        #
+        # @return [Hash{String,Hash{Target,String}]
+        #
+        def user_target_xcconfig_values_by_target_by_key
+          pod_targets.each_with_object({}) do |target, hash|
+            target.spec_consumers.each do |spec_consumer|
+              spec_consumer.user_target_xcconfig.each do |k, v|
+                (hash[k] ||= {})[target] = v
+              end
+            end
+          end
+        end
+
+        # Merges the +user_target_xcconfig+ for all pod targets into the
+        # #xcconfig and warns on conflicting definitions.
+        #
+        # @return [Hash{String, String}]
+        #
+        def merged_user_target_xcconfigs
+          settings = user_target_xcconfig_values_by_target_by_key
+          settings.each_with_object({}) do |(key, values_by_target), xcconfig|
+            uniq_values = values_by_target.values.uniq
+            values_are_bools = uniq_values.all? { |v| v =~ /(yes|no)/i }
+            if values_are_bools
+              # Boolean build settings
+              if uniq_values.count > 1
+                UI.warn 'Can\'t merge user_target_xcconfig for pod targets: ' \
+                  "#{values_by_target.keys.map(&:label)}. Boolean build "\
+                  "setting #{key} has different values."
+              else
+                xcconfig[key] = uniq_values.first
+              end
+            elsif key =~ /S$/
+              # Plural build settings
+              xcconfig[key] = uniq_values.join(' ')
+            else
+              # Singular build settings
+              if uniq_values.count > 1
+                UI.warn 'Can\'t merge user_target_xcconfig for pod targets: ' \
+                  "#{values_by_target.keys.map(&:label)}. Singular build "\
+                  "setting #{key} has different values."
+              else
+                xcconfig[key] = uniq_values.first
+              end
+            end
+          end
+        end
+
         #---------------------------------------------------------------------#
       end
     end