xcodeproj 1.21.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bab98461310ae1a7572bae0b8dd9025cdf12ee53a64c7d457e8d4982d71982d
-  data.tar.gz: 59d1ddc2130ee7f88eb646a1c98dbf14e45da612448a12425df004d416f93961
+  metadata.gz: e0788725232bb312e7454dbec2640d078bd514c469deeeff4e57544e837187ac
+  data.tar.gz: fc1af51df95f4fdcaee3040adafdb0afaf5de03e036a32d2769c7af9a2d36fd5
 SHA512:
-  metadata.gz: 4e2431ba9cbf960b7e1ef53ff3dae65565b51fbba1cbb0c6a096d29251ca49c751403575c46fdae6252e176b8ada16ac5aa659d6b015f142eb338e21718a7a38
-  data.tar.gz: dfe1895012ba35e32dd44b15b4b2cb5e8ab2957eb7919f39a514c7675b8a261a4f4688006ace24e6eae0dcfc07be70392cf047f0cb66bd8f1036bc3fe817f366
+  metadata.gz: 39a057723656bb7016aa845c427a90c1c6e264f34c3c8eee67b424a7952975371ad56e44569b7e0681154cbd2a4ed2bb82589dc1087a95969d64cfa2c5a5654a
+  data.tar.gz: c9c72a16fe6597d7b6408b49ec6d98083c7e828e444b9e3a17c5155da69e1d3f6869ccfdbaa074eeb13537e81c5e214fb8dc1a975a8633a6c2c718333748fd2b

data/README.md

@@ -1,8 +1,8 @@
 # Xcodeproj
 
-[![Build Status](https://img.shields.io/travis/CocoaPods/Xcodeproj/master.svg?style=flat)](https://travis-ci.org/CocoaPods/Xcodeproj)
-[![Coverage](https://img.shields.io/codeclimate/coverage/github/CocoaPods/Xcodeproj.svg?style=flat)](https://codeclimate.com/github/CocoaPods/Xcodeproj)
-[![Code Climate](https://img.shields.io/codeclimate/maintainability/CocoaPods/Xcodeproj.svg?style=flat&label=code%20climate)](https://codeclimate.com/github/CocoaPods/Xcodeproj)
+[![Build Status](https://img.shields.io/github/workflow/status/CocoaPods/Xcodeproj/Specs)](https://github.com/CocoaPods/Xcodeproj/actions)
+[![Maintainability](https://api.codeclimate.com/v1/badges/40ae104586c859d3581e/maintainability)](https://codeclimate.com/github/CocoaPods/Xcodeproj/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/40ae104586c859d3581e/test_coverage)](https://codeclimate.com/github/CocoaPods/Xcodeproj/test_coverage)
 
 Xcodeproj lets you create and modify Xcode projects from [Ruby][ruby].
 Script boring management tasks or build Xcode-friendly libraries. Also includes
@@ -64,6 +64,7 @@ project.targets.each do |target|
     config.build_settings['MY_CUSTOM_FLAG'] ||= 'TRUE'
   end
 end
+project.save
 ```
 
 ## Command Line Tool

data/lib/xcodeproj/command.rb

@@ -33,11 +33,14 @@ module Xcodeproj
         elsif projects.size > 1
           raise Informative, 'There are more than one Xcode project documents ' \
                              'in the current working directory. Please specify ' \
-                             'which to use with the `--project` option.'
+                             'the project as the first argument, or specify ' \
+                             'which to use with the --project option if using ' \
+                             'target-diff.'
         else
           raise Informative, 'No Xcode project document found in the current ' \
-                             'working directory. Please specify which to use ' \
-                             'with the `--project` option.'
+                             'working directory. Please specify the project ' \
+                             'as the first argument, or specify which to use ' \
+                             'with the --project option if using target-diff.' \
         end
         @xcodeproj_path = Pathname.new(xcodeproj_path).expand_path
       end

data/lib/xcodeproj/constants.rb

@@ -32,15 +32,15 @@ module Xcodeproj
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_KNOWN_OBJECT_VERSION = 55
+    LAST_KNOWN_OBJECT_VERSION = 56
 
     # @return [String] The last known Xcode version to Xcodeproj.
     #
-    LAST_UPGRADE_CHECK = '1240'
+    LAST_UPGRADE_CHECK = '1300'
 
     # @return [String] The last known Xcode version to Xcodeproj.
     #
-    LAST_SWIFT_UPGRADE_CHECK = '1240'
+    LAST_SWIFT_UPGRADE_CHECK = '1300'
 
     # @return [String] The version of `.xcscheme` files supported by Xcodeproj
     #
@@ -128,6 +128,7 @@ module Xcodeproj
     # @return [Hash] The compatibility version string for different object versions.
     #
     COMPATIBILITY_VERSION_BY_OBJECT_VERSION = {
+      56 => 'Xcode 14.0',
       55 => 'Xcode 13.0',
       54 => 'Xcode 12.0',
       53 => 'Xcode 11.4',

data/lib/xcodeproj/differ.rb

@@ -113,8 +113,8 @@ module Xcodeproj
       ensure_class(value_2, Array)
       return nil if value_1 == value_2
 
-      new_objects_value_1 = (value_1 - value_2)
-      new_objects_value_2 = (value_2 - value_1)
+      new_objects_value_1 = array_non_unique_diff(value_1, value_2)
+      new_objects_value_2 = array_non_unique_diff(value_2, value_1)
       return nil if value_1.empty? && value_2.empty?
 
       matched_diff = {}
@@ -234,6 +234,37 @@ module Xcodeproj
       raise "Wrong type `#{object.inspect}`" unless object.is_a?(klass)
     end
 
+    # Returns the difference between two arrays, taking into account the number of times an element
+    # repeats in both arrays.
+    #
+    # @param  [Array] value_1
+    #         First array to the difference operation.
+    #
+    # @param  [Array] value_2
+    #         Second array to the difference operation.
+    #
+    # @return [Array]
+    #
+    def self.array_non_unique_diff(value_1, value_2)
+      value_2_elements_by_count = value_2.reduce({}) do |hash, element|
+        updated_element_hash = hash.key?(element) ? { element => hash[element] + 1 } : { element => 1 }
+        hash.merge(updated_element_hash)
+      end
+
+      value_1_elements_by_deletions =
+        value_1.to_set.map do |element|
+          times_to_delete_element = value_2_elements_by_count[element] || 0
+          next [element, times_to_delete_element]
+        end.to_h
+
+      value_1.select do |element|
+        if value_1_elements_by_deletions[element] > 0
+          value_1_elements_by_deletions[element] -= 1
+          next false
+        end
+        next true
+      end
+    end
     #-------------------------------------------------------------------------#
   end
 end

data/lib/xcodeproj/gem_version.rb

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

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

@@ -12,7 +12,7 @@ module Xcodeproj
 
         # @!group Attributes
 
-        # @return [String] the name of the Target.
+        # @return [String] the name of the configuration.
         #
         attribute :name, String
 

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

@@ -17,6 +17,13 @@ module Xcodeproj
         #
         attribute :compiler_spec, String
 
+        # @return [String] the discovered dependency file to use.
+        #
+        # @example
+        #   `$(DERIVED_FILES_DIR)/$(INPUT_FILE_NAME).d`.
+        #
+        attribute :dependency_file, String
+
         # @return [String] the type of the files that should be processed by
         #         this rule.
         #

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

@@ -313,8 +313,7 @@ module Xcodeproj
         end
 
         # In addition to removing the file reference, this will also remove any
-        # items related to this reference in case it represents an external
-        # Xcode project.
+        # items related to this reference.
         #
         # @see AbstractObject#remove_from_project
         #
@@ -327,6 +326,8 @@ module Xcodeproj
             project_reference[:product_group].remove_from_project
             project.root_object.project_references.delete(project_reference)
           end
+
+          build_files.each(&:remove_from_project)
           super
         end
 

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

@@ -441,13 +441,32 @@ module Xcodeproj
             result = File.basename(x.display_name.downcase, '.*') <=> File.basename(y.display_name.downcase, '.*')
             if result.zero?
               result = File.extname(x.display_name.downcase) <=> File.extname(y.display_name.downcase)
-              if result.zero?
+              if result.zero? && !(x.path.nil? || y.path.nil?)
                 result = x.path.downcase <=> y.path.downcase
               end
             end
             result
           end
         end
+
+        # @return [Array<PBXBuildFile>] the build files associated with the
+        #         current reference proxy.
+        #
+        def build_files
+          referrers.grep(PBXBuildFile)
+        end
+
+        # In addition to removing the reference proxy, this will also remove any
+        # items related to this reference.
+        #
+        # @see AbstractObject#remove_from_project
+        #
+        # @return [void]
+        #
+        def remove_from_project
+          build_files.each(&:remove_from_project)
+          super
+        end
       end
 
       #-----------------------------------------------------------------------#

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

@@ -61,6 +61,25 @@ module Xcodeproj
           return path if path
           super
         end
+
+        # @return [Array<PBXBuildFile>] the build files associated with the
+        #         current reference proxy.
+        #
+        def build_files
+          referrers.grep(PBXBuildFile)
+        end
+
+        # In addition to removing the reference proxy, this will also remove any
+        # items related to this reference.
+        #
+        # @see AbstractObject#remove_from_project
+        #
+        # @return [void]
+        #
+        def remove_from_project
+          build_files.each(&:remove_from_project)
+          super
+        end
       end
     end
   end

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

@@ -30,9 +30,14 @@ module Xcodeproj
         #
         attribute :platform_filter, String
 
-        # @return [String] the product reference for this target dependency.
+        # @return [Array<String>] the platform filters for this target dependency.
         #
-        attribute :product_ref, String
+        attribute :platform_filters, Array
+
+        # @return [XCSwiftPackageProductDependency] the Swift Package product
+        #         for this target dependency.
+        #
+        has_one :product_ref, XCSwiftPackageProductDependency
 
         public
 
@@ -45,20 +50,22 @@ module Xcodeproj
           return name if name
           return target.name if target
           return target_proxy.remote_info if target_proxy
+          return product_ref.product_name if product_ref
         end
 
         def ascii_plist_annotation
           " #{isa} "
         end
 
-        # @return [String] uuid of the target, if the dependency
-        #         is a native target, otherwise the uuid of the
-        #         target in the sub-project if the dependency is
-        #         a target proxy
+        # @return [String] the uuid of the target if the dependency is a native
+        #         target, the uuid of the target in the sub-project if the
+        #         dependency is a target proxy, nil if the dependency is a Swift
+        #         Package.
         #
         def native_target_uuid
           return target.uuid if target
           return target_proxy.remote_global_id_string if target_proxy
+          return nil if product_ref
           raise "Expected target or target_proxy, from which to fetch a uuid for target '#{display_name}'." \
             "Find and clear the PBXTargetDependency entry with uuid '#{@uuid}' in your .xcodeproj."
         end

data/lib/xcodeproj/scheme/test_action.rb

@@ -151,6 +151,44 @@ module Xcodeproj
         arguments
       end
 
+      # @return [Array<BuildableReference>]
+      #         The list of BuildableReference (code coverage targets) associated with this Test Action
+      #
+      def code_coverage_targets
+        return [] unless @xml_element.elements['CodeCoverageTargets']
+
+        @xml_element.elements['CodeCoverageTargets'].get_elements('BuildableReference').map do |node|
+          BuildableReference.new(node)
+        end
+      end
+
+      # @param [Array<BuildableReference>] buildable_references
+      #         Sets the list of BuildableReference (code coverage targets) associated with this Test Action
+      #
+      def code_coverage_targets=(buildable_references)
+        @xml_element.attributes['onlyGenerateCoverageForSpecifiedTargets'] = bool_to_string(true)
+
+        @xml_element.delete_element('CodeCoverageTargets')
+        coverage_targets_element = @xml_element.add_element('CodeCoverageTargets')
+        buildable_references.each do |reference|
+          coverage_targets_element.add_element(reference.xml_element)
+        end
+
+        code_coverage_targets
+      end
+
+      # @param [BuildableReference] buildable_reference
+      #        Add a BuildableReference (code coverage target) to this Test Action
+      #
+      def add_code_coverage_target(buildable_reference)
+        @xml_element.attributes['onlyGenerateCoverageForSpecifiedTargets'] = bool_to_string(true)
+
+        coverage_targets_element = @xml_element.elements['CodeCoverageTargets'] || @xml_element.add_element('CodeCoverageTargets')
+        coverage_targets_element.add_element(buildable_reference.xml_element)
+
+        code_coverage_targets
+      end
+
       #-------------------------------------------------------------------------#
 
       class TestableReference < XMLElementWrapper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomos
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.