cocoapods 1.6.2 → 1.7.0.beta.1

data/lib/cocoapods/target/build_settings.rb

@@ -20,9 +20,11 @@ module Pod
         GCC_PREPROCESSOR_DEFINITIONS
         GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS
         HEADER_SEARCH_PATHS
+        INCLUDED_SOURCE_FILE_NAMES
         INFOPLIST_PREPROCESSOR_DEFINITIONS
         LD_RUNPATH_SEARCH_PATHS
         LIBRARY_SEARCH_PATHS
+        LOCALIZED_STRING_MACRO_NAMES
         OTHER_CFLAGS
         OTHER_CPLUSPLUSFLAGS
         OTHER_LDFLAGS
@@ -31,6 +33,9 @@ module Pod
         SECTORDER_FLAGS
         SWIFT_ACTIVE_COMPILATION_CONDITIONS
         SWIFT_INCLUDE_PATHS
+        SYSTEM_FRAMEWORK_SEARCH_PATHS
+        SYSTEM_HEADER_SEARCH_PATHS
+        USER_HEADER_SEARCH_PATHS
         WARNING_CFLAGS
         WARNING_LDFLAGS
       ).to_set.freeze
@@ -205,7 +210,7 @@ module Pod
 
       # @return [String]
       define_build_settings_method :code_sign_identity, :build_setting => true do
-        return unless target.requires_frameworks?
+        return unless target.build_as_dynamic?
         return unless target.platform.to_sym == :osx
         ''
       end
@@ -226,7 +231,7 @@ module Pod
 
       # @return [Array<String>]
       define_build_settings_method :framework_search_paths, :build_setting => true, :memoized => true do
-        framework_search_paths_to_import_developer_frameworks(frameworks)
+        framework_search_paths_to_import_developer_frameworks(frameworks + weak_frameworks)
       end
 
       # @param [Array<String>] frameworks
@@ -424,6 +429,22 @@ module Pod
         end
       end
 
+      # Merges the spec-defined xcconfig into the derived xcconfig,
+      # overriding any singular settings and merging plural settings.
+      #
+      # @param  [Hash<String,String>] spec_xcconfig_hash the merged xcconfig defined in the spec.
+      #
+      # @param  [Xcodeproj::Config] xcconfig the config to merge into.
+      #
+      # @return [Xcodeproj::Config] the merged config.
+      #
+      def merge_spec_xcconfig_into_xcconfig(spec_xcconfig_hash, xcconfig)
+        plural_configs, singlular_configs = spec_xcconfig_hash.partition { |k, _v| PLURAL_SETTINGS.include?(k) }.map { |a| Hash[a] }
+        xcconfig.attributes.merge!(singlular_configs)
+        xcconfig.merge!(plural_configs)
+        xcconfig
+      end
+
       # Filters out pod targets whose `specs` are a subset of
       # another target's.
       #
@@ -433,11 +454,13 @@ module Pod
       #
       def select_maximal_pod_targets(pod_targets)
         subset_targets = []
-        pod_targets.uniq.combination(2) do |a, b|
-          if (a.specs - b.specs).empty?
-            subset_targets << a
-          elsif (b.specs - a.specs).empty?
-            subset_targets << b
+        pod_targets.uniq.group_by(&:pod_name).each do |_pod_name, targets|
+          targets.combination(2) do |a, b|
+            if (a.specs - b.specs).empty?
+              subset_targets << a
+            elsif (b.specs - a.specs).empty?
+              subset_targets << b
+            end
           end
         end
         pod_targets - subset_targets
@@ -460,29 +483,47 @@ module Pod
         attr_reader :test_xcconfig
         alias test_xcconfig? test_xcconfig
 
+        attr_reader :app_xcconfig
+        alias app_xcconfig? app_xcconfig
+
+        attr_reader :library_xcconfig
+        alias library_xcconfig? library_xcconfig
+
+        def non_library_xcconfig?
+          !library_xcconfig?
+        end
+
         # @return [Specification]
-        #   The test specification these build settings are for or `nil`.
+        #   The non-library specification these build settings are for or `nil`.
         #
-        attr_reader :test_spec
+        attr_reader :non_library_spec
 
         # Initializes a new instance
         #
         # @param [PodTarget] target
         #   see {#target}
         #
-        # @param [Specification] test_spec
-        #  see {#test_spec}
+        # @param [Specification] non_library_spec
+        #  see {#non_library_spec}
         #
-        def initialize(target, test_spec = nil)
+        def initialize(target, non_library_spec = nil)
           super(target)
-          @test_spec = test_spec
-          @test_xcconfig = !test_spec.nil?
+          if @non_library_spec = non_library_spec
+            @test_xcconfig = non_library_spec.test_specification?
+            @app_xcconfig = non_library_spec.app_specification?
+            @xcconfig_spec_type = non_library_spec.spec_type
+            @library_xcconfig = false
+          else
+            @test_xcconfig = @app_xcconfig = false
+            @xcconfig_spec_type = :library
+            @library_xcconfig = true
+          end
         end
 
         # @return [Xcodeproj::Xconfig]
         define_build_settings_method :xcconfig, :memoized => true do
           xcconfig = super()
-          xcconfig.merge(merged_pod_target_xcconfigs)
+          merge_spec_xcconfig_into_xcconfig(merged_pod_target_xcconfigs, xcconfig)
         end
 
         #-------------------------------------------------------------------------#
@@ -510,14 +551,14 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :frameworks, :memoized => true, :sorted => true, :uniqued => true do
-          return [] if (!target.requires_frameworks? || target.static_framework?) && !test_xcconfig?
+          return [] if target.build_as_static? && library_xcconfig?
 
           frameworks = []
           frameworks.concat consumer_frameworks
-          if test_xcconfig? || (target.should_build? && target.requires_frameworks? && !target.static_framework?)
+          if non_library_xcconfig? || (target.should_build? && target.build_as_dynamic?)
             frameworks.concat vendored_static_frameworks.map { |l| File.basename(l, '.framework') }
           end
-          if test_xcconfig?
+          if non_library_xcconfig?
             frameworks.concat vendored_dynamic_frameworks.map { |l| File.basename(l, '.framework') }
             frameworks.concat dependent_targets.flat_map { |pt| pt.build_settings.frameworks_to_import }
           end
@@ -527,22 +568,22 @@ module Pod
         # @return [Array<String>]
         define_build_settings_method :static_frameworks_to_import, :memoized => true do
           static_frameworks_to_import = []
-          static_frameworks_to_import.concat vendored_static_frameworks.map { |f| File.basename(f, '.framework') } unless target.should_build? && target.requires_frameworks? && !target.static_framework?
-          static_frameworks_to_import << target.product_basename if target.should_build? && target.requires_frameworks? && target.static_framework?
+          static_frameworks_to_import.concat vendored_static_frameworks.map { |f| File.basename(f, '.framework') } unless target.should_build? && target.build_as_dynamic?
+          static_frameworks_to_import << target.product_basename if target.should_build? && target.build_as_static_framework?
           static_frameworks_to_import
         end
 
         # @return [Array<String>]
         define_build_settings_method :dynamic_frameworks_to_import, :memoized => true do
           dynamic_frameworks_to_import = vendored_dynamic_frameworks.map { |f| File.basename(f, '.framework') }
-          dynamic_frameworks_to_import << target.product_basename if target.should_build? && target.requires_frameworks? && !target.static_framework?
+          dynamic_frameworks_to_import << target.product_basename if target.should_build? && target.build_as_dynamic_framework?
           dynamic_frameworks_to_import.concat consumer_frameworks
           dynamic_frameworks_to_import
         end
 
         # @return [Array<String>]
-        define_build_settings_method :weak_frameworks, :memoized => true, :sorted => true, :uniqued => true do
-          return [] if (!target.requires_frameworks? || target.static_framework?) && !test_xcconfig?
+        define_build_settings_method :weak_frameworks, :memoized => true do
+          return [] if target.build_as_static? && library_xcconfig?
 
           weak_frameworks = spec_consumers.flat_map(&:weak_frameworks)
           weak_frameworks.concat dependent_targets.flat_map { |pt| pt.build_settings.weak_frameworks_to_import }
@@ -564,13 +605,13 @@ module Pod
           paths = super().dup
           paths.concat dependent_targets.flat_map { |t| t.build_settings.framework_search_paths_to_import }
           paths.concat framework_search_paths_to_import
-          paths.delete(target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)) unless test_xcconfig?
+          paths.delete(target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)) if library_xcconfig?
           paths
         end
 
         # @return [String]
         define_build_settings_method :framework_header_search_path, :memoized => true do
-          return unless target.requires_frameworks?
+          return unless target.build_as_framework?
           "#{target.build_product_path}/Headers"
         end
 
@@ -583,7 +624,7 @@ module Pod
         define_build_settings_method :framework_search_paths_to_import, :memoized => true do
           paths = framework_search_paths_to_import_developer_frameworks(consumer_frameworks)
           paths.concat vendored_framework_search_paths
-          return paths unless target.requires_frameworks? && target.should_build?
+          return paths unless target.build_as_framework? && target.should_build?
 
           paths + [target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)]
         end
@@ -615,14 +656,14 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :libraries, :memoized => true, :sorted => true, :uniqued => true do
-          return [] if (!target.requires_frameworks? || target.static_framework?) && !test_xcconfig?
+          return [] if library_xcconfig? && target.build_as_static?
 
           libraries = []
-          if test_xcconfig? || target.requires_frameworks? && !target.static_framework?
+          if non_library_xcconfig? || target.build_as_dynamic?
             libraries.concat linker_names_from_libraries(vendored_static_libraries)
             libraries.concat libraries_to_import
           end
-          if test_xcconfig?
+          if non_library_xcconfig?
             libraries.concat dependent_targets.flat_map { |pt| pt.build_settings.dynamic_libraries_to_import }
             libraries.concat dependent_targets.flat_map { |pt| pt.build_settings.static_libraries_to_import }
           end
@@ -632,17 +673,17 @@ module Pod
         # @return [Array<String>]
         define_build_settings_method :static_libraries_to_import, :memoized => true do
           static_libraries_to_import = []
-          unless target.should_build? && target.requires_frameworks? && !target.static_framework?
-            static_libraries_to_import.concat linker_names_from_libraries(vendored_static_libraries)
-          end
-          static_libraries_to_import << target.product_basename if target.should_build? && !target.requires_frameworks?
+          static_libraries_to_import.concat linker_names_from_libraries(vendored_static_libraries) unless target.should_build? && target.build_as_dynamic?
+          static_libraries_to_import << target.product_basename if target.should_build? && target.build_as_static_library?
           static_libraries_to_import
         end
 
         # @return [Array<String>]
         define_build_settings_method :dynamic_libraries_to_import, :memoized => true do
-          linker_names_from_libraries(vendored_dynamic_libraries) +
-          spec_consumers.flat_map(&:libraries)
+          dynamic_libraries_to_import = linker_names_from_libraries(vendored_dynamic_libraries)
+          dynamic_libraries_to_import.concat spec_consumers.flat_map(&:libraries)
+          dynamic_libraries_to_import << target.product_basename if target.should_build? && target.build_as_dynamic_library?
+          dynamic_libraries_to_import
         end
 
         # @return [Array<String>]
@@ -652,14 +693,14 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :library_search_paths, :build_setting => true, :memoized => true, :sorted => true, :uniqued => true do
-          return [] if (!target.requires_frameworks? || target.static_framework?) && !test_xcconfig?
+          return [] if library_xcconfig? && target.build_as_static?
 
           vendored = library_search_paths_to_import.dup
           vendored.concat dependent_targets.flat_map { |t| t.build_settings.vendored_dynamic_library_search_paths }
-          if test_xcconfig?
-            vendored.concat dependent_targets.flat_map { |t| t.build_settings.library_search_paths_to_import }
-          else
+          if library_xcconfig?
             vendored.delete(target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE))
+          else
+            vendored.concat(dependent_targets.flat_map { |t| t.build_settings.library_search_paths_to_import })
           end
           vendored
         end
@@ -687,7 +728,7 @@ module Pod
         # @return [Array<String>]
         define_build_settings_method :library_search_paths_to_import, :memoized => true do
           vendored_library_search_paths = vendored_static_library_search_paths + vendored_dynamic_library_search_paths
-          return vendored_library_search_paths if target.requires_frameworks? || !target.should_build?
+          return vendored_library_search_paths if target.build_as_framework? || !target.should_build?
 
           vendored_library_search_paths << target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)
         end
@@ -704,7 +745,7 @@ module Pod
         # @return [Array<String>]
         define_build_settings_method :module_map_file_to_import, :memoized => true do
           return unless target.should_build?
-          return if target.requires_frameworks?
+          return if target.build_as_framework? # framework module maps are automatically discovered
           return unless target.defines_module?
 
           if target.uses_swift?
@@ -717,24 +758,32 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :header_search_paths, :build_setting => true, :memoized => true, :sorted => true do
-          target.header_search_paths(:include_dependent_targets_for_test_spec => test_spec)
+          target.header_search_paths(:include_dependent_targets_for_test_spec => test_xcconfig? && non_library_spec, :include_dependent_targets_for_app_spec => app_xcconfig? && non_library_spec)
         end
 
         # @return [Array<String>]
         define_build_settings_method :public_header_search_paths, :memoized => true, :sorted => true do
-          target.header_search_paths(:include_dependent_targets_for_test_spec => test_xcconfig?, :include_private_headers => false)
+          target.header_search_paths(:include_dependent_targets_for_test_spec => test_xcconfig? && non_library_spec, :include_dependent_targets_for_app_spec => app_xcconfig? && non_library_spec, :include_private_headers => false)
         end
 
         #-------------------------------------------------------------------------#
 
         # @!group Swift
 
+        # @see BuildSettings#other_swift_flags_without_swift?
+        def other_swift_flags_without_swift?
+          return false if library_xcconfig?
+
+          target.uses_swift_for_spec?(non_library_spec)
+        end
+
         # @return [Array<String>]
         define_build_settings_method :other_swift_flags, :build_setting => true, :memoized => true do
-          return unless target.uses_swift?
+          return unless target.uses_swift? || other_swift_flags_without_swift?
+
           flags = super()
-          flags << '-suppress-warnings' if target.inhibit_warnings?
-          if !target.requires_frameworks? && target.defines_module? && !test_xcconfig?
+          flags << '-suppress-warnings' if target.inhibit_warnings? && library_xcconfig?
+          if !target.build_as_framework? && target.defines_module? && library_xcconfig?
             flags.concat %w( -import-underlying-module -Xcc -fmodule-map-file=${SRCROOT}/${MODULEMAP_FILE} )
           end
           flags
@@ -743,13 +792,13 @@ module Pod
         # @return [Array<String>]
         define_build_settings_method :swift_include_paths, :build_setting => true, :memoized => true, :sorted => true, :uniqued => true do
           paths = dependent_targets.flat_map { |t| t.build_settings.swift_include_paths_to_import }
-          paths.concat swift_include_paths_to_import if test_xcconfig?
+          paths.concat swift_include_paths_to_import if non_library_xcconfig?
           paths
         end
 
         # @return [Array<String>]
         define_build_settings_method :swift_include_paths_to_import, :memoized => true do
-          return [] unless target.uses_swift? && !target.requires_frameworks?
+          return [] unless target.uses_swift? && !target.build_as_framework?
 
           [target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)]
         end
@@ -763,20 +812,20 @@ module Pod
         # @note this is only true when generating build settings for a test bundle
         #
         def requires_objc_linker_flag?
-          test_xcconfig?
+          test_xcconfig? || app_xcconfig?
         end
 
         # @return [Boolean] whether the `-fobjc-arc` linker flag is required.
         #
         define_build_settings_method :requires_fobjc_arc?, :memoized => true do
           target.podfile.set_arc_compatibility_flag? &&
-          file_accessors.any? { |fa| fa.spec_consumer.requires_arc? }
+            file_accessors.any? { |fa| fa.spec_consumer.requires_arc? }
         end
 
         # @return [Array<String>]
         define_build_settings_method :ld_runpath_search_paths, :build_setting => true, :memoized => true do
-          return unless test_xcconfig?
-          _ld_runpath_search_paths(:test_bundle => true)
+          return if library_xcconfig?
+          _ld_runpath_search_paths(:test_bundle => test_xcconfig?)
         end
 
         #-------------------------------------------------------------------------#
@@ -795,7 +844,7 @@ module Pod
 
         # @return [String]
         define_build_settings_method :configuration_build_dir, :build_setting => true, :memoized => true do
-          return if test_xcconfig?
+          return if non_library_xcconfig?
           target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)
         end
 
@@ -807,7 +856,9 @@ module Pod
         define_build_settings_method :dependent_targets, :memoized => true do
           select_maximal_pod_targets(
             if test_xcconfig?
-              target.dependent_targets_for_test_spec(test_spec)
+              target.dependent_targets_for_test_spec(non_library_spec)
+            elsif app_xcconfig?
+              target.dependent_targets_for_app_spec(non_library_spec)
             else
               target.recursive_dependent_targets
             end,
@@ -838,12 +889,12 @@ module Pod
 
         # @return [Array<Sandbox::FileAccessor>]
         define_build_settings_method :file_accessors, :memoized => true do
-          target.file_accessors.select { |fa| fa.spec.test_specification? == test_xcconfig? }
+          target.file_accessors.select { |fa| fa.spec.spec_type == @xcconfig_spec_type }
         end
 
         # @return [Array<Specification::Consumer>]
         define_build_settings_method :spec_consumers, :memoized => true do
-          target.spec_consumers.select { |c| c.spec.test_specification? == test_xcconfig? }
+          target.spec_consumers.select { |fa| fa.spec.spec_type == @xcconfig_spec_type }
         end
 
         #-------------------------------------------------------------------------#
@@ -880,7 +931,7 @@ module Pod
         # @return [Xcodeproj::Config] xcconfig
         define_build_settings_method :xcconfig, :memoized => true do
           xcconfig = super()
-          xcconfig.merge(merged_user_target_xcconfigs)
+          merge_spec_xcconfig_into_xcconfig(merged_user_target_xcconfigs, xcconfig)
         end
 
         #-------------------------------------------------------------------------#
@@ -938,14 +989,14 @@ module Pod
         define_build_settings_method :header_search_paths, :build_setting => true, :memoized => true, :sorted => true, :uniqued => true do
           paths = []
 
-          if !target.requires_frameworks? || !pod_targets.all?(&:should_build?)
+          if !target.build_as_framework? || !pod_targets.all?(&:should_build?)
             paths.concat target.sandbox.public_headers.search_paths(target.platform)
           end
 
           # Make frameworks headers discoverable with any syntax (quotes,
           # brackets, @import, etc.)
           paths.concat pod_targets.
-            select { |pt| pt.requires_frameworks? && pt.should_build? }.
+            select { |pt| pt.build_as_framework? && pt.should_build? }.
             map { |pt| pt.build_settings.framework_header_search_path }
 
           paths.concat target.search_paths_aggregate_targets.flat_map { |at| at.build_settings(configuration_name).header_search_paths }
@@ -962,7 +1013,7 @@ module Pod
           silenced_headers = []
           silenced_frameworks = []
           pod_targets_inhibiting_warnings.each do |pt|
-            if pt.requires_frameworks? && pt.should_build?
+            if pt.build_as_framework? && pt.should_build?
               silenced_headers.append pt.build_settings.framework_header_search_path
             else
               silenced_headers.concat pt.build_settings.public_header_search_paths
@@ -1022,7 +1073,7 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :ld_runpath_search_paths, :build_setting => true, :memoized => true, :uniqued => true do
-          return unless target.requires_frameworks? || any_vendored_dynamic_artifacts?
+          return unless pod_targets.any?(&:build_as_dynamic?) || any_vendored_dynamic_artifacts?
           symbol_type = target.user_targets.map(&:symbol_type).uniq.first
           test_bundle = symbol_type == :octest_bundle || symbol_type == :unit_test_bundle || symbol_type == :ui_test_bundle
           _ld_runpath_search_paths(:requires_host_target => target.requires_host_target?, :test_bundle => test_bundle)
@@ -1032,16 +1083,24 @@ module Pod
         define_build_settings_method :any_vendored_dynamic_artifacts?, :memoized => true do
           pod_targets.any? do |pt|
             pt.file_accessors.any? do |fa|
-              fa.vendored_dynamic_artifacts.any?
+              !fa.vendored_dynamic_artifacts.empty?
+            end
+          end
+        end
+
+        # @return [Boolean]
+        define_build_settings_method :any_vendored_static_artifacts?, :memoized => true do
+          pod_targets.any? do |pt|
+            pt.file_accessors.any? do |fa|
+              !fa.vendored_static_artifacts.empty?
             end
           end
         end
 
         # @return [Boolean]
         define_build_settings_method :requires_objc_linker_flag?, :memoized => true do
-          !target.requires_frameworks? ||
-            pod_targets.any?(&:static_framework?) ||
-            pod_targets.flat_map(&:file_accessors).any? { |fa| !fa.vendored_static_artifacts.empty? }
+          pod_targets.any?(&:build_as_static?) ||
+            any_vendored_static_artifacts?
         end
 
         # @return [Boolean]