xcodeproj 1.13.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 935c76050e4379c9a8d243645b906017320dd0d74c79e68b474b9bd1147d378e
-  data.tar.gz: 87bed25d95253e5ee9af635b0582c86fa76c8859bb2fab625e57b9f6a178db22
+  metadata.gz: f2adbf62ffb149af02324c1929f3ed398249ab6b0ceed90bf5dd981cb83606a0
+  data.tar.gz: 5384e737db7dabd546677ac0a0d933637e0e23042d32a7523edc935a309b20c6
 SHA512:
-  metadata.gz: fad701838ce5ba4869348fb41e934a275d6442e2072baa3b02894ec4ad8f4b421532f79d543a8da817a74fa2b5fe6baab27a696b13afd3960029ac3fa799cbe5
-  data.tar.gz: 755f65c8c0e2589eb98ca78332df42a59d8ce031f3e3493f62a266e95933ef9cd835669929b8240bd0d541cac9939ddb0294c58c2c0e0cc67d4e3e40a2d9d873
+  metadata.gz: ad51d1217443a0e304daa9299f1b8a096e3d854af40b7d0b2cc38a05b8233ceda8b84f66e03145e795f85797c4455d7c33b91c39c10215d276fc596fd160a366
+  data.tar.gz: b070de0c98177aecabf5703ab76f75b96f48375694186b89b59078d0b9cf5aacaba2820492a043523a6b325e2787db79baa60cc39bd515d50836126162b4c33b

data/lib/xcodeproj/command/config_dump.rb

@@ -76,7 +76,11 @@ module Xcodeproj
 
       def dump_config_to_file(settings, file_path, includes = [])
         dir = @output_path + file_path + '..'
-        dir.mkdir unless dir.exist?
+        dir.mkpath
+
+        settings = Hash[settings.map do |k, v|
+          [k, Array(v).join(' ')]
+        end]
 
         config = Config.new(settings)
         config.includes = includes

data/lib/xcodeproj/constants.rb

@@ -32,7 +32,7 @@ module Xcodeproj
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_KNOWN_OBJECT_VERSION = 52
+    LAST_KNOWN_OBJECT_VERSION = 54
 
     # @return [String] The last known object version to Xcodeproj.
     #
@@ -126,6 +126,8 @@ module Xcodeproj
     # @return [Hash] The compatibility version string for different object versions.
     #
     COMPATIBILITY_VERSION_BY_OBJECT_VERSION = {
+      54 => 'Xcode 12.0',
+      53 => 'Xcode 11.4',
       52 => 'Xcode 11.0',
       51 => 'Xcode 10.0',
       50 => 'Xcode 9.3',
@@ -172,6 +174,9 @@ module Xcodeproj
       :unit_test_bundle     => 'xctest',
       :ui_test_bundle       => 'xctest',
       :app_extension        => 'appex',
+      :messages_application => 'app',
+      :messages_extension   => 'appex',
+      :sticker_pack         => 'appex',
       :watch2_extension     => 'appex',
       :watch2_app           => 'app',
       :watch2_app_container => 'app',

data/lib/xcodeproj/gem_version.rb

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

data/lib/xcodeproj/project/object.rb

@@ -350,7 +350,7 @@ module Xcodeproj
           unless object = project.objects_by_uuid[uuid] || project.new_from_plist(uuid, objects_by_uuid_plist)
             UI.warn "`#{inspect}` attempted to initialize an object with " \
               "an unknown UUID. `#{uuid}` for attribute: " \
-              "`#{attribute.name}`. This can be the result of a merge and  " \
+              "`#{attribute.name}`. This can be the result of a merge and " \
               'the unknown UUID is being discarded.'
           end
           object

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

data/lib/xcodeproj/project/object/helpers/file_references_factory.rb

@@ -52,7 +52,9 @@ module Xcodeproj
               prefix = 'lib'
             end
             extension = Constants::PRODUCT_UTI_EXTENSIONS[product_type]
-            ref = new_reference(group, "#{prefix}#{target_name}.#{extension}", :built_products)
+            path = "#{prefix}#{target_name}"
+            path += ".#{extension}" if extension
+            ref = new_reference(group, path, :built_products)
             ref.include_in_index = '0'
             ref.set_explicit_file_type
             ref

data/lib/xcodeproj/project/object/helpers/groupable_helper.rb

@@ -148,7 +148,7 @@ module Xcodeproj
             when '<group>'
               object_parent = parent(object)
               if object_parent.isa == 'PBXProject'.freeze
-                object.project.project_dir
+                object.project.project_dir + object.project.root_object.project_dir_path
               else
                 real_path(object_parent)
               end

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

@@ -42,7 +42,7 @@ module Xcodeproj
         #        the key of the build setting.
         #
         # @param [Bool] resolve_against_xcconfig
-        #        wether the resolved setting should take in consideration any
+        #        whether the resolved setting should take in consideration any
         #        configuration file present.
         #
         # @return [Hash{String => String}] The value of the build setting
@@ -74,6 +74,10 @@ module Xcodeproj
         # @param [String] key
         #        the key of the build setting.
         #
+        # @param [Boolean] resolve_against_xcconfig
+        #        whether the resolved setting should take in consideration any
+        #        configuration file present.
+        #
         # @raise  If the build setting has multiple values.
         #
         # @note   As it is common not to have a setting with no value for
@@ -83,8 +87,8 @@ module Xcodeproj
         #
         # @return [String] The value of the build setting.
         #
-        def common_resolved_build_setting(key)
-          values = resolved_build_setting(key).values.compact.uniq
+        def common_resolved_build_setting(key, resolve_against_xcconfig: false)
+          values = resolved_build_setting(key, resolve_against_xcconfig).values.compact.uniq
           if values.count <= 1
             values.first
           else

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

@@ -73,6 +73,7 @@ module Xcodeproj
           hash = {}
           hash['displayName'] = display_name
           hash['isa'] = isa
+          hash['targetProxy'] = target_proxy.to_tree_hash
           hash
         end
 

data/lib/xcodeproj/scheme/build_action.rb

@@ -59,6 +59,20 @@ module Xcodeproj
         end
       end
 
+      # @param [Array<BuildAction::Entry>] entries
+      #        Sets the list of BuildActionEntry nodes associated with this Build Action.
+      #
+      def entries=(entries)
+        @xml_element.delete_element('BuildActionEntries')
+        unless entries.empty?
+          entries_element = @xml_element.add_element('BuildActionEntries')
+          entries.each do |entry_node|
+            entries_element.add_element(entry_node.xml_element)
+          end
+        end
+        entries
+      end
+
       # @param [BuildAction::Entry] entry
       #        The BuildActionEntry to add to the list of targets to build for the various actions
       #
@@ -185,6 +199,13 @@ module Xcodeproj
         def add_buildable_reference(ref)
           @xml_element.add_element(ref.xml_element)
         end
+
+        # @param [BuildableReference] ref
+        #         The BuildableReference to remove from the list of targets this entry will build
+        #
+        def remove_buildable_reference(ref)
+          @xml_element.delete_element(ref.xml_element)
+        end
       end
     end
   end

data/lib/xcodeproj/scheme/launch_action.rb

@@ -143,6 +143,22 @@ module Xcodeproj
         @xml_element.add_element(arguments.xml_element) if arguments
         arguments
       end
+
+      # @return [Array<MacroExpansion>]
+      #         The list of MacroExpansion bound with this LaunchAction
+      #
+      def macro_expansions
+        @xml_element.get_elements('MacroExpansion').map do |node|
+          MacroExpansion.new(node)
+        end
+      end
+
+      # @param [MacroExpansion] macro_expansion
+      #        Add a MacroExpansion to this LaunchAction
+      #
+      def add_macro_expansion(macro_expansion)
+        @xml_element.add_element(macro_expansion.xml_element)
+      end
     end
   end
 end

data/lib/xcodeproj/scheme/test_action.rb

@@ -58,7 +58,7 @@ module Xcodeproj
         string_to_bool(@xml_element.attributes['codeCoverageEnabled'])
       end
 
-      # @rparam [Bool] flag
+      # @param [Bool] flag
       #         Set whether Clang Code Coverage is enabled ('Gather coverage data' turned ON)
       #
       def code_coverage_enabled=(flag)
@@ -76,6 +76,18 @@ module Xcodeproj
         end
       end
 
+      # @param [Array<TestableReference>] testables
+      #         Sets the list of TestableReference (test bundles) associated with this Test Action
+      #
+      def testables=(testables)
+        @xml_element.delete_element('Testables')
+        testables_element = @xml_element.add_element('Testables')
+        testables.each do |testable|
+          testables_element.add_element(testable.xml_element)
+        end
+        testables
+      end
+
       # @param [TestableReference] testable
       #        Add a TestableReference (test bundle) to this Test Action
       #
@@ -219,6 +231,13 @@ module Xcodeproj
           @xml_element.add_element(ref.xml_element)
         end
 
+        # @param [BuildableReference] ref
+        #         The BuildableReference to remove from the list of targets this entry will build
+        #
+        def remove_buildable_reference(ref)
+          @xml_element.delete_element(ref.xml_element)
+        end
+
         # @return [Array<Test>]
         #         The list of SkippedTest this action will skip.
         #

data/lib/xcodeproj/workspace.rb

@@ -107,8 +107,9 @@ module Xcodeproj
       else
         raise ArgumentError, "Input to the << operator must be a file path or FileReference, got #{path_or_reference.inspect}"
       end
-
-      @document.root.add_element(project_file_reference.to_node)
+      unless file_references.any? { |ref| project_file_reference.eql? ref }
+        @document.root.add_element(project_file_reference.to_node)
+      end
       load_schemes_from_project File.expand_path(projpath || project_file_reference.path)
     end
 

data/lib/xcodeproj/workspace/file_reference.rb

@@ -13,7 +13,7 @@ module Xcodeproj
       # @param [#to_s] type @see type
       #
       def initialize(path, type = 'group')
-        @path = path.to_s
+        @path = Pathname.new(path.to_s).cleanpath.to_s
         @type = type.to_s
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomos
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.3.0
 description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script
   boring management tasks or build Xcode-friendly libraries. Also includes support
   for Xcode workspaces (.xcworkspace) and configuration files (.xcconfig).