xcodeproj 1.14.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3af9cb46ce94c2bb3e0bff2b7b28e82f5a037788378fa512274f685d41c2910b
-  data.tar.gz: 4047b7ac654f2aaeaba3363e56362249c2ce4456cea8e73eb27cd731648d4792
+  metadata.gz: db41f610ede2d2129632067db352ca8a6011f364e792629eb2cda1e95ded7006
+  data.tar.gz: b7c2a633c72ac7f3da93bbc621604ffb5550a02cf0e0126c9a932a0f4569640e
 SHA512:
-  metadata.gz: c47d7f26b3c3078f7cf2094aa81fd809cf938d9741530d09c166a37b3bc0a98e9e4e59e2b51222d1c43b64f9620ff35c0c83077ca6331b49bebed117fa6891f8
-  data.tar.gz: 65a27789a94d192a1d7c25c851d3ab36fab276f70145432c5a1ca3ecd398ca6f571206aee498d59c05dc688542ca2facd4bac7de08845a936e8cb54452c3073e
+  metadata.gz: 78013282d38ab9fb0829401198c34f4d0953078fe550687b6979bd94c43b40b3b9c45eb4ca99d785f3af03a48c6d0597f3425679e1b471f3d2e699b37e533973
+  data.tar.gz: a762fe5999cccd9b3da51a4f787513142b7a1e41875cc5870566b0e7d259b19ab891b2f46569e42c179029562356005feb3d2ad796e1bdd442cda5dbcffc7d41

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',
@@ -138,46 +140,48 @@ module Xcodeproj
     # @return [Hash] The uniform type identifier of various product types.
     #
     PRODUCT_TYPE_UTI = {
-      :application          => 'com.apple.product-type.application',
-      :framework            => 'com.apple.product-type.framework',
-      :dynamic_library      => 'com.apple.product-type.library.dynamic',
-      :static_library       => 'com.apple.product-type.library.static',
-      :bundle               => 'com.apple.product-type.bundle',
-      :octest_bundle        => 'com.apple.product-type.bundle',
-      :unit_test_bundle     => 'com.apple.product-type.bundle.unit-test',
-      :ui_test_bundle       => 'com.apple.product-type.bundle.ui-testing',
-      :app_extension        => 'com.apple.product-type.app-extension',
-      :command_line_tool    => 'com.apple.product-type.tool',
-      :watch_app            => 'com.apple.product-type.application.watchapp',
-      :watch2_app           => 'com.apple.product-type.application.watchapp2',
-      :watch2_app_container => 'com.apple.product-type.application.watchapp2-container',
-      :watch_extension      => 'com.apple.product-type.watchkit-extension',
-      :watch2_extension     => 'com.apple.product-type.watchkit2-extension',
-      :tv_extension         => 'com.apple.product-type.tv-app-extension',
-      :messages_application => 'com.apple.product-type.application.messages',
-      :messages_extension   => 'com.apple.product-type.app-extension.messages',
-      :sticker_pack         => 'com.apple.product-type.app-extension.messages-sticker-pack',
-      :xpc_service          => 'com.apple.product-type.xpc-service',
+      :application                           => 'com.apple.product-type.application',
+      :application_on_demand_install_capable => 'com.apple.product-type.application.on-demand-install-capable',
+      :framework                             => 'com.apple.product-type.framework',
+      :dynamic_library                       => 'com.apple.product-type.library.dynamic',
+      :static_library                        => 'com.apple.product-type.library.static',
+      :bundle                                => 'com.apple.product-type.bundle',
+      :octest_bundle                         => 'com.apple.product-type.bundle',
+      :unit_test_bundle                      => 'com.apple.product-type.bundle.unit-test',
+      :ui_test_bundle                        => 'com.apple.product-type.bundle.ui-testing',
+      :app_extension                         => 'com.apple.product-type.app-extension',
+      :command_line_tool                     => 'com.apple.product-type.tool',
+      :watch_app                             => 'com.apple.product-type.application.watchapp',
+      :watch2_app                            => 'com.apple.product-type.application.watchapp2',
+      :watch2_app_container                  => 'com.apple.product-type.application.watchapp2-container',
+      :watch_extension                       => 'com.apple.product-type.watchkit-extension',
+      :watch2_extension                      => 'com.apple.product-type.watchkit2-extension',
+      :tv_extension                          => 'com.apple.product-type.tv-app-extension',
+      :messages_application                  => 'com.apple.product-type.application.messages',
+      :messages_extension                    => 'com.apple.product-type.app-extension.messages',
+      :sticker_pack                          => 'com.apple.product-type.app-extension.messages-sticker-pack',
+      :xpc_service                           => 'com.apple.product-type.xpc-service',
     }.freeze
 
     # @return [Hash] The extensions or the various product UTIs.
     #
     PRODUCT_UTI_EXTENSIONS = {
-      :application          => 'app',
-      :framework            => 'framework',
-      :dynamic_library      => 'dylib',
-      :static_library       => 'a',
-      :bundle               => 'bundle',
-      :octest_bundle        => 'octest',
-      :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',
+      :application                           => 'app',
+      :application_on_demand_install_capable => 'app',
+      :framework                             => 'framework',
+      :dynamic_library                       => 'dylib',
+      :static_library                        => 'a',
+      :bundle                                => 'bundle',
+      :octest_bundle                         => 'octest',
+      :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',
     }.freeze
 
     # @return [Hash] The common build settings grouped by platform, and build

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.18.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

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/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

@@ -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.14.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Eloy Duran
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2020-08-12 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).
@@ -168,7 +168,7 @@ homepage: https://github.com/cocoapods/xcodeproj
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,8 +183,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.
 test_files: []