xcodeproj 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3af9cb46ce94c2bb3e0bff2b7b28e82f5a037788378fa512274f685d41c2910b
-  data.tar.gz: 4047b7ac654f2aaeaba3363e56362249c2ce4456cea8e73eb27cd731648d4792
+  metadata.gz: f67749b29dedd0818af4098881cb282662875d984f7d05c7bda0af4b0c86ec82
+  data.tar.gz: '09e6e7cac5b75fa227f838431390860392378891e2f3fc8248fa7795e005d04a'
 SHA512:
-  metadata.gz: c47d7f26b3c3078f7cf2094aa81fd809cf938d9741530d09c166a37b3bc0a98e9e4e59e2b51222d1c43b64f9620ff35c0c83077ca6331b49bebed117fa6891f8
-  data.tar.gz: 65a27789a94d192a1d7c25c851d3ab36fab276f70145432c5a1ca3ecd398ca6f571206aee498d59c05dc688542ca2facd4bac7de08845a936e8cb54452c3073e
+  metadata.gz: e7317ac6d84cc9dc3b66d9dc73eb4ae5f9c585e60daed3255bfd209db017a34e1a44f25358e3a1ec7fe61f9c809f0ecb3c526b796b489f8e4e473ffe577e81b3
+  data.tar.gz: 16fe549706c8e9c7806de7a1a739ffc0ea145762a0e70a6906884c2437bf8661bd2068f43e9095d208d0ebceda8a36a8c1a7ad39966bc84782490dc4e4720e36

data/lib/xcodeproj/gem_version.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
   # The version of the xcodeproj gem.
   #
-  VERSION = '1.14.0'.freeze unless defined? Xcodeproj::VERSION
+  VERSION = '1.15.0'.freeze unless defined? Xcodeproj::VERSION
 end

data/lib/xcodeproj/project/object/build_configuration.rb

@@ -6,6 +6,10 @@ module Xcodeproj
       # {PBXProject} or a {PBXNativeTarget}.
       #
       class XCBuildConfiguration < AbstractObject
+        MUTUAL_RECURSION_SENTINEL = 'xcodeproj.mutual_recursion_sentinel'.freeze
+
+        private_constant :MUTUAL_RECURSION_SENTINEL
+
         # @!group Attributes
 
         # @return [String] the name of the Target.
@@ -79,16 +83,19 @@ module Xcodeproj
         #        the key of the build setting.
         #
         # @param [PBXNativeTarget] root_target
-        #        use this to resolve complete recursion between project and targets
+        #        use this to resolve complete recursion between project and targets.
+        #
+        # @param [String] previous_key
+        #        use this to resolve complete recursion between different build settings.
         #
         # @return [String] The value of the build setting
         #
-        def resolve_build_setting(key, root_target = nil)
+        def resolve_build_setting(key, root_target = nil, previous_key = nil)
           setting = build_settings[key]
-          setting = resolve_variable_substitution(key, setting, root_target)
+          setting = resolve_variable_substitution(key, setting, root_target, previous_key)
 
           config_setting = config[key]
-          config_setting = resolve_variable_substitution(key, config_setting, root_target)
+          config_setting = resolve_variable_substitution(key, config_setting, root_target, previous_key)
 
           project_setting = project.build_configuration_list[name]
           project_setting = nil if equal?(project_setting)
@@ -99,6 +106,12 @@ module Xcodeproj
             'SRCROOT' => project.project_dir.to_s,
           }
 
+          # if previous_key is nil, it means that we're back at the first call, so we can replace our sentinel string
+          # used to prevent recursion with nil
+          if previous_key.nil? && setting == MUTUAL_RECURSION_SENTINEL
+            setting = nil
+          end
+
           [defaults[key], project_setting, config_setting, setting, ENV[key]].compact.reduce(nil) do |inherited, value|
             expand_build_setting(value, inherited)
           end
@@ -142,7 +155,7 @@ module Xcodeproj
           build_setting_value.flat_map { |value| Constants::INHERITED_KEYWORDS.include?(value) ? inherited : value }
         end
 
-        def resolve_variable_substitution(key, value, root_target)
+        def resolve_variable_substitution(key, value, root_target, previous_key = nil)
           case value
           when Array
             return value.map { |v| resolve_variable_substitution(key, v, root_target) }
@@ -168,9 +181,20 @@ module Xcodeproj
           when key
             # to prevent infinite recursion
             nil
+          when previous_key
+            # to prevent infinite recursion; we don't return nil as for the self recursion because it needs to be
+            # distinguished outside this method too
+            MUTUAL_RECURSION_SENTINEL
           else
             configuration_to_resolve_against = root_target ? root_target.build_configuration_list[name] : self
-            resolved_value_for_variable = configuration_to_resolve_against.resolve_build_setting(variable, root_target) || ''
+            resolved_value_for_variable = configuration_to_resolve_against.resolve_build_setting(variable, root_target, key) || ''
+
+            # we use this sentinel string instead of nil, because, otherwise, it would be swallowed by the default empty
+            # string from the preceding line, and we want to distinguish between mutual recursion and other cases
+            if resolved_value_for_variable == MUTUAL_RECURSION_SENTINEL
+              return MUTUAL_RECURSION_SENTINEL
+            end
+
             value = value.gsub(variable_reference, resolved_value_for_variable)
             resolve_variable_substitution(key, value, root_target)
           end
@@ -191,14 +215,15 @@ module Xcodeproj
 
           settings.keys.each do |key|
             next unless value = settings[key]
+            stripped_key = key.sub(/\[[^\]]+\]$/, '')
             case value
             when String
-              next unless array_settings.include?(key)
+              next unless array_settings.include?(stripped_key)
               array_value = split_build_setting_array_to_string(value)
               next unless array_value.size > 1
               settings[key] = array_value
             when Array
-              next if value.size > 1 && array_settings.include?(key)
+              next if value.size > 1 && array_settings.include?(stripped_key)
               settings[key] = value.join(' ')
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomos
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.