cocoapods 0.38.2 → 0.39.0.beta.1

data/lib/cocoapods.rb

@@ -67,10 +67,4 @@ module Pod
     autoload :UmbrellaHeader,          'cocoapods/generator/umbrella_header'
     autoload :XCConfig,                'cocoapods/generator/xcconfig'
   end
-
-  module Hooks
-    autoload :InstallerRepresentation, 'cocoapods/hooks/installer_representation'
-    autoload :LibraryRepresentation,   'cocoapods/hooks/library_representation'
-    autoload :PodRepresentation,       'cocoapods/hooks/pod_representation'
-  end
 end

data/lib/cocoapods/command/lib.rb

@@ -115,16 +115,19 @@ module Pod
         DESC
 
         def self.options
-          [['--quick',       'Lint skips checks that would require to download and build the spec'],
-           ['--allow-warnings', 'Lint validates even if warnings are present'],
-           ['--subspec=NAME', 'Lint validates only the given subspec'],
-           ['--no-subspecs', 'Lint skips validation of subspecs'],
-           ['--no-clean', 'Lint leaves the build directory intact for inspection'],
-           ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
-           ['--use-libraries', 'Lint uses static libraries to install the spec'],
-           ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependant pods ' \
-            '(defaults to https://github.com/CocoaPods/Specs.git). '\
-            'Multiple sources must be comma-delimited.']].concat(super)
+          [
+            ['--quick', 'Lint skips checks that would require to download and build the spec'],
+            ['--allow-warnings', 'Lint validates even if warnings are present'],
+            ['--subspec=NAME', 'Lint validates only the given subspec'],
+            ['--no-subspecs', 'Lint skips validation of subspecs'],
+            ['--no-clean', 'Lint leaves the build directory intact for inspection'],
+            ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
+            ['--use-libraries', 'Lint uses static libraries to install the spec'],
+            ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
+             '(defaults to https://github.com/CocoaPods/Specs.git). ' \
+             'Multiple sources must be comma-delimited.'],
+            ['--private', 'Lint skips checks that apply only to public specs'],
+          ].concat(super)
         end
 
         def initialize(argv)
@@ -136,6 +139,7 @@ module Pod
           @only_subspec    = argv.option('subspec')
           @use_frameworks  = !argv.flag?('use-libraries')
           @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
+          @private         = argv.flag?('private', false)
           @podspecs_paths  = argv.arguments!
           super
         end
@@ -156,6 +160,7 @@ module Pod
             validator.no_subspecs    = !@subspecs || @only_subspec
             validator.only_subspec   = @only_subspec
             validator.use_frameworks = @use_frameworks
+            validator.ignore_public_only_results = @private
             validator.validate
 
             unless @clean

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

@@ -15,7 +15,9 @@ module Pod
         ]
 
         def self.options
-          [['--only-errors', 'Lint presents only the errors']].concat(super)
+          [
+            ['--only-errors', 'Lint presents only the errors'],
+          ].concat(super)
         end
 
         def initialize(argv)

data/lib/cocoapods/command/repo/push.rb

@@ -20,17 +20,25 @@ module Pod
         ]
 
         def self.options
-          [['--allow-warnings', 'Allows pushing even if there are warnings'],
-           ['--use-libraries', 'Linter uses static libraries to install the spec'],
-           ['--local-only', 'Does not perform the step of pushing REPO to its remote']].concat(super)
+          [
+            ['--allow-warnings', 'Allows pushing even if there are warnings'],
+            ['--use-libraries', 'Linter uses static libraries to install the spec'],
+            ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
+             '(defaults to all available repos). ' \
+             'Multiple sources must be comma-delimited.'],
+            ['--local-only', 'Does not perform the step of pushing REPO to its remote'],
+            ['--no-private', 'Lint includes checks that apply only to public repos'],
+          ].concat(super)
         end
 
         def initialize(argv)
           @allow_warnings = argv.flag?('allow-warnings')
           @local_only = argv.flag?('local-only')
           @repo = argv.shift_argument
+          @source_urls = argv.option('sources', SourcesManager.all.map(&:url).join(',')).split(',')
           @podspec = argv.shift_argument
           @use_frameworks = !argv.flag?('use-libraries')
+          @private = argv.flag?('private', true)
           super
         end
 
@@ -84,9 +92,10 @@ module Pod
         def validate_podspec_files
           UI.puts "\nValidating #{'spec'.pluralize(count)}".yellow
           podspec_files.each do |podspec|
-            validator = Validator.new(podspec, SourcesManager.all.map(&:url))
+            validator = Validator.new(podspec, @source_urls)
             validator.allow_warnings = @allow_warnings
             validator.use_frameworks = @use_frameworks
+            validator.ignore_public_only_results = @private
             begin
               validator.validate
             rescue => e

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

@@ -126,13 +126,12 @@ Pod::Spec.new do |s|
   s.version      = "#{data[:version]}"
   s.summary      = "#{data[:summary]}"
 
+  # This description is used to generate tags and improve search results.
+  #   * Think: What does it do? Why did you write it? What is the focus?
+  #   * Try to keep it short, snappy and to the point.
+  #   * Write the description between the DESC delimiters below.
+  #   * Finally, don't worry about the indent, CocoaPods strips it!
   s.description  = <<-DESC
-                   A longer description of #{data[:name]} in Markdown format.
-
-                   * Think: Why did you write this? What is the focus? What does it do?
-                   * CocoaPods will be using this to generate tags, and improve search results.
-                   * Try to keep it short, snappy and to the point.
-                   * Finally, don't worry about the indent, CocoaPods strips it!
                    DESC
 
   s.homepage     = "#{data[:homepage]}"

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

@@ -15,16 +15,19 @@ module Pod
         ]
 
         def self.options
-          [['--quick', 'Lint skips checks that would require to download and build the spec'],
-           ['--allow-warnings', 'Lint validates even if warnings are present'],
-           ['--subspec=NAME', 'Lint validates only the given subspec'],
-           ['--no-subspecs', 'Lint skips validation of subspecs'],
-           ['--no-clean', 'Lint leaves the build directory intact for inspection'],
-           ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
-           ['--use-libraries', 'Lint uses static libraries to install the spec'],
-           ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependant pods ' \
-            '(defaults to https://github.com/CocoaPods/Specs.git). '\
-            'Multiple sources must be comma-delimited.']].concat(super)
+          [
+            ['--quick', 'Lint skips checks that would require to download and build the spec'],
+            ['--allow-warnings', 'Lint validates even if warnings are present'],
+            ['--subspec=NAME', 'Lint validates only the given subspec'],
+            ['--no-subspecs', 'Lint skips validation of subspecs'],
+            ['--no-clean', 'Lint leaves the build directory intact for inspection'],
+            ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
+            ['--use-libraries', 'Lint uses static libraries to install the spec'],
+            ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
+             '(defaults to https://github.com/CocoaPods/Specs.git). ' \
+             'Multiple sources must be comma-delimited.'],
+            ['--private', 'Lint skips checks that apply only to public specs'],
+          ].concat(super)
         end
 
         def initialize(argv)
@@ -36,6 +39,7 @@ module Pod
           @only_subspec    = argv.option('subspec')
           @use_frameworks  = !argv.flag?('use-libraries')
           @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
+          @private         = argv.flag?('private', false)
           @podspecs_paths  = argv.arguments!
           super
         end
@@ -52,6 +56,7 @@ module Pod
             validator.no_subspecs    = !@subspecs || @only_subspec
             validator.only_subspec   = @only_subspec
             validator.use_frameworks = @use_frameworks
+            validator.ignore_public_only_results = @private
             validator.validate
             failure_reasons << validator.failure_reason
 

data/lib/cocoapods/executable.rb

@@ -45,14 +45,10 @@ module Pod
     #
     # @return [String] the output of the command (STDOUT and STDERR).
     #
-    # @todo   Find a way to display the live output of the commands.
-    #
-    def self.execute_command(executable, command, raise_on_failure)
+    def self.execute_command(executable, command, raise_on_failure = true)
       bin = which(executable)
       raise Informative, "Unable to locate the executable `#{executable}`" unless bin
 
-      require 'shellwords'
-
       command = command.map(&:to_s)
       full_command = "#{bin} #{command.join(' ')}"
 
@@ -64,7 +60,8 @@ module Pod
       end
 
       status = popen3(bin, command, stdout, stderr)
-      output = stdout.join + stderr.join
+      stdout, stderr = stdout.join, stderr.join
+      output = stdout + stderr
       unless status.success?
         if raise_on_failure
           raise Informative, "#{full_command}\n\n#{output}"
@@ -72,6 +69,7 @@ module Pod
           UI.message("[!] Failed: #{full_command}".red)
         end
       end
+
       output
     end
 
@@ -95,6 +93,38 @@ module Pod
       nil
     end
 
+    # Runs the given command, capturing the desired output.
+    #
+    # @param  [String] bin
+    #         The binary to use.
+    #
+    # @param  [Array<#to_s>] command
+    #         The command to send to the binary.
+    #
+    # @param  [Symbol] capture
+    #         Whether it should raise if the command fails.
+    #
+    # @raise  If the executable could not be located.
+    #
+    # @return [(String, Process::Status)]
+    #         The desired captured output from the command, and the status from
+    #         running the command.
+    #
+    def self.capture_command(executable, command, capture: :merge)
+      bin = which(executable)
+      raise Informative, "Unable to locate the executable `#{executable}`" unless bin
+
+      require 'open3'
+      command = command.map(&:to_s)
+      case capture
+      when :merge then Open3.capture2e(bin, *command)
+      when :both then Open3.capture3(bin, *command)
+      when :out then Open3.capture2(bin, *command)
+      when :err then Open3.capture3(bin, *command).drop(1)
+      when :none then Open3.capture2(bin, *command).last
+      end
+    end
+
     private
 
     def self.popen3(bin, command, stdout, stderr)

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -160,7 +160,7 @@ EOS
 
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-if [[ "${ACTION}" == "install" ]]; then
+if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
   mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
   rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -34,7 +34,7 @@ module Pod
       # @return [String] The contents of the embed frameworks script.
       #
       def script
-        script = <<-eos.strip_heredoc
+        script = <<-SH.strip_heredoc
           #!/bin/sh
           set -e
 
@@ -47,8 +47,10 @@ module Pod
           {
             if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
               local source="${BUILT_PRODUCTS_DIR}/$1"
-            else
+            elif [ -r "${BUILT_PRODUCTS_DIR}/$(basename "$1")" ]; then
               local source="${BUILT_PRODUCTS_DIR}/$(basename "$1")"
+            elif [ -r "$1" ]; then
+              local source="$1"
             fi
 
             local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
@@ -62,14 +64,24 @@ module Pod
             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}"
 
+            local basename
+            basename="$(basename -s .framework "$1")"
+            binary="${destination}/${basename}.framework/${basename}"
+            if ! [ -r "$binary" ]; then
+              binary="${destination}/${basename}"
+            fi
+
+            # Strip invalid architectures so "fat" simulator / device frameworks work on device
+            if [[ "$(file "$binary")" == *"dynamically linked shared library"* ]]; then
+              strip_invalid_archs "$binary"
+            fi
+
             # Resign the code if required by the build settings to avoid unstable apps
             code_sign_if_enabled "${destination}/$(basename "$1")"
 
             # Embed linked Swift runtime libraries
-            local basename
-            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}/${basename}.framework/${basename}" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
+            swift_runtime_libs=$(xcrun otool -LX "$binary" | 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}"
@@ -87,15 +99,33 @@ module Pod
             fi
           }
 
-        eos
-        script += "\n" unless frameworks_by_config.values.all?(&:empty?)
+          # Strip invalid architectures
+          strip_invalid_archs() {
+            binary="$1"
+            # Get architectures for current file
+            archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+            stripped=""
+            for arch in $archs; do
+              if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then
+                # Strip non-valid architectures in-place
+                lipo -remove "$arch" -output "$binary" "$binary" || exit 1
+                stripped="$stripped $arch"
+              fi
+            done
+            if [[ "$stripped" ]]; then
+              echo "Stripped $binary of architectures:$stripped"
+            fi
+          }
+
+        SH
+        script << "\n" unless frameworks_by_config.values.all?(&:empty?)
         frameworks_by_config.each do |config, frameworks|
           unless frameworks.empty?
-            script += %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)
+            script << %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)
             frameworks.each do |framework|
-              script += "  install_framework '#{framework}'\n"
+              script << %(  install_framework "#{framework}"\n)
             end
-            script += "fi\n"
+            script << "fi\n"
           end
         end
         script

data/lib/cocoapods/generator/xcconfig.rb

@@ -6,8 +6,7 @@ module Pod
     #
     module XCConfig
       autoload :AggregateXCConfig,  'cocoapods/generator/xcconfig/aggregate_xcconfig'
-      autoload :PublicPodXCConfig,  'cocoapods/generator/xcconfig/public_pod_xcconfig'
-      autoload :PrivatePodXCConfig, 'cocoapods/generator/xcconfig/private_pod_xcconfig'
+      autoload :PodXCConfig,        'cocoapods/generator/xcconfig/pod_xcconfig'
       autoload :XCConfigHelper,     'cocoapods/generator/xcconfig/xcconfig_helper'
     end
   end

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

@@ -53,11 +53,12 @@ module Pod
         #
         def generate
           includes_static_libs = !target.requires_frameworks?
-          includes_static_libs ||= pod_targets.flat_map(&:file_accessors).any? { |fa| !fa.vendored_libraries.empty? }
+          includes_static_libs ||= pod_targets.flat_map(&:file_accessors).any? { |fa| !fa.vendored_static_artifacts.empty? }
           config = {
             'OTHER_LDFLAGS' => '$(inherited) ' + XCConfigHelper.default_ld_flags(target, includes_static_libs),
             'PODS_ROOT' => target.relative_pods_root,
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
+            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ',
           }
           @xcconfig = Xcodeproj::Config.new(config)
 
@@ -106,13 +107,13 @@ module Pod
               'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(framework_header_search_paths, '-iquote'),
             }
             if pod_targets.any? { |t| !t.should_build? }
-              # Make library headers discoverale by `#import "…"`
+              # Make library headers discoverable by `#import "…"`
               library_header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
-              build_settings['HEADER_SEARCH_PATHS'] = XCConfigHelper.quote(library_header_search_paths)
+              build_settings['HEADER_SEARCH_PATHS'] = '$(inherited) ' + XCConfigHelper.quote(library_header_search_paths)
               build_settings['OTHER_CFLAGS'] += ' ' + XCConfigHelper.quote(library_header_search_paths, '-isystem')
             end
             if pod_targets.any? { |t| t.should_build? && t.scoped? }
-              build_settings['FRAMEWORK_SEARCH_PATHS'] = '$(inherited) "$PODS_FRAMEWORK_BUILD_PATH"'
+              build_settings['FRAMEWORK_SEARCH_PATHS'] = '"$PODS_FRAMEWORK_BUILD_PATH"'
             end
             @xcconfig.merge!(build_settings)
           else
@@ -224,14 +225,14 @@ module Pod
         #
         def merged_user_target_xcconfigs
           settings = user_target_xcconfig_values_by_consumer_by_key
-          settings.each_with_object({}) do |(key, values_by_target), xcconfig|
-            uniq_values = values_by_target.values.uniq
+          settings.each_with_object({}) do |(key, values_by_consumer), xcconfig|
+            uniq_values = values_by_consumer.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(&:name)}. Boolean build "\
+                  "#{values_by_consumer.keys.map(&:name)}. Boolean build "\
                   "setting #{key} has different values."
               else
                 xcconfig[key] = uniq_values.first
@@ -243,7 +244,7 @@ module Pod
               # Singular build settings
               if uniq_values.count > 1
                 UI.warn 'Can\'t merge user_target_xcconfig for pod targets: ' \
-                  "#{values_by_target.keys.map(&:name)}. Singular build "\
+                  "#{values_by_consumer.keys.map(&:name)}. Singular build "\
                   "setting #{key} has different values."
               else
                 xcconfig[key] = uniq_values.first

data/lib/cocoapods/generator/xcconfig/{private_pod_xcconfig.rb → pod_xcconfig.rb}

@@ -3,28 +3,21 @@ module Pod
     module XCConfig
       # Generates the private xcconfigs for the pod targets.
       #
-      # The private xcconfig file for a Pod target merges the configuration
-      # values of the public namespaced xcconfig with the default private
-      # configuration values required by CocoaPods.
+      # The xcconfig file for a Pod target merges the pod target
+      # configuration values with the default configuration values
+      # required by CocoaPods.
       #
-      class PrivatePodXCConfig
+      class PodXCConfig
         # @return [Target] the target represented by this xcconfig.
         #
         attr_reader :target
 
-        # @return [Xcodeproj::Config] The public xcconfig which this one will
-        #         use.
-        #
-        attr_reader :public_xcconfig
-
         # Initialize a new instance
         #
         # @param  [Target] target @see target
-        # @param  [Xcodeproj::Config] public_xcconfig @see public_xcconfig
         #
-        def initialize(target, public_xcconfig)
+        def initialize(target)
           @target = target
-          @public_xcconfig = public_xcconfig
         end
 
         # @return [Xcodeproj::Config] The generated xcconfig.
@@ -50,6 +43,7 @@ module Pod
           target_search_paths = target.build_headers.search_paths(target.platform)
           sandbox_search_paths = target.sandbox.public_headers.search_paths(target.platform)
           search_paths = target_search_paths.concat(sandbox_search_paths).uniq
+          framework_search_paths = target.dependent_targets.flat_map(&:file_accessors).flat_map(&:vendored_frameworks).map { |fw| '${PODS_ROOT}/' << fw.dirname.relative_path_from(target.sandbox.root).to_s }
 
           config = {
             'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
@@ -57,9 +51,12 @@ module Pod
             'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths),
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
             'SKIP_INSTALL' => 'YES',
+            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ' << XCConfigHelper.quote(framework_search_paths)
             # 'USE_HEADERMAP' => 'NO'
           }
 
+          @xcconfig = Xcodeproj::Config.new(config)
+
           if target.requires_frameworks? && target.scoped?
             # Only quote the FRAMEWORK_SEARCH_PATHS entry, because it’s a setting that takes multiple values.
             # In addition, quoting CONFIGURATION_BUILD_DIR would make it be interpreted as a relative path.
@@ -68,63 +65,17 @@ module Pod
               'FRAMEWORK_SEARCH_PATHS' => '"$PODS_FRAMEWORK_BUILD_PATH"',
               'CONFIGURATION_BUILD_DIR' => '$PODS_FRAMEWORK_BUILD_PATH',
             }
-            config.merge!(build_settings)
+            @xcconfig.merge!(build_settings)
           end
 
-          xcconfig_hash = add_xcconfig_namespaced_keys(public_xcconfig.to_hash, config, target.xcconfig_prefix)
-          @xcconfig = Xcodeproj::Config.new(xcconfig_hash)
+          XCConfigHelper.add_settings_for_file_accessors_of_target(target, @xcconfig)
+          target.file_accessors.each do |file_accessor|
+            @xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig)
+          end
           XCConfigHelper.add_target_specific_settings(target, @xcconfig)
-          @xcconfig.includes = [target.name]
           @xcconfig
         end
 
-        private
-
-        #-----------------------------------------------------------------------#
-
-        # !@group Private Helpers
-
-        # Returns the hash representation of an xcconfig which inherit from the
-        # namespaced keys of a given one.
-        #
-        # @param  [Hash] source_config
-        #         The xcconfig whose keys need to be inherited.
-        #
-        # @param  [Hash] destination_config
-        #         The config which should inherit the source config keys.
-        #
-        # @return [Hash] The inheriting xcconfig.
-        #
-        def add_xcconfig_namespaced_keys(source_config, destination_config, prefix)
-          result = destination_config.dup
-          source_config.each do |key, _value|
-            prefixed_key = prefix + conditional_less_key(key)
-            current_value = destination_config[key]
-            if current_value
-              result[key] = "#{current_value} ${#{prefixed_key}}"
-            else
-              result[key] = "${#{prefixed_key}}"
-            end
-          end
-          result
-        end
-
-        # Strips the [*]-syntax from the given xcconfig key.
-        #
-        # @param  [String] key
-        #         The key to strip.
-        #
-        # @return [String] The stripped key.
-        #
-        def conditional_less_key(key)
-          brackets_index = key.index('[')
-          if brackets_index
-            key[0...brackets_index]
-          else
-            key
-          end
-        end
-
         #-----------------------------------------------------------------------#
       end
     end