xcodeproj 1.21.0 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bab98461310ae1a7572bae0b8dd9025cdf12ee53a64c7d457e8d4982d71982d
-  data.tar.gz: 59d1ddc2130ee7f88eb646a1c98dbf14e45da612448a12425df004d416f93961
+  metadata.gz: 9280a3358b3ab5cb87a7d2a8823d1b2959cb63d7dd01c1af2cd7f2f603a4fc90
+  data.tar.gz: b902495ad29630ab972e83717ef522f868d28678b519cb5477deff6d94db5b53
 SHA512:
-  metadata.gz: 4e2431ba9cbf960b7e1ef53ff3dae65565b51fbba1cbb0c6a096d29251ca49c751403575c46fdae6252e176b8ada16ac5aa659d6b015f142eb338e21718a7a38
-  data.tar.gz: dfe1895012ba35e32dd44b15b4b2cb5e8ab2957eb7919f39a514c7675b8a261a4f4688006ace24e6eae0dcfc07be70392cf047f0cb66bd8f1036bc3fe817f366
+  metadata.gz: 6058d88e97109756e60077277e1a67eb22f26578987b1666aaede1bbb8222a712e509ce22d4834801e034a3dc733201c7c4eaa1b72b5bc36482f1dab71caee15
+  data.tar.gz: d87165c6807a48f37bdf045a2d7159410e6c8acc2be39c13db586266110912bce271b0f7f32f8d6e0c27619e60529c1a38a4d1707c40c7efb5327f3bfdcc5af3

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://github.com/CocoaPods/Xcodeproj/workflows/Specs/badge.svg)](https://github.com/CocoaPods/Xcodeproj/actions/workflows/Specs.yml)
+[![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

@@ -14,6 +14,10 @@ module Xcodeproj
     #
     LAST_KNOWN_TVOS_SDK = '14.0'
 
+    # @return [String] The last known visionOS SDK (unstable).
+    #
+    LAST_KNOWN_VISIONOS_SDK = '1.0'
+
     # @return [String] The last known watchOS SDK (stable).
     #
     LAST_KNOWN_WATCHOS_SDK = '7.0'
@@ -32,15 +36,15 @@ module Xcodeproj
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_KNOWN_OBJECT_VERSION = 55
+    LAST_KNOWN_OBJECT_VERSION = 60
 
     # @return [String] The last known Xcode version to Xcodeproj.
     #
-    LAST_UPGRADE_CHECK = '1240'
+    LAST_UPGRADE_CHECK = '1500'
 
     # @return [String] The last known Xcode version to Xcodeproj.
     #
-    LAST_SWIFT_UPGRADE_CHECK = '1240'
+    LAST_SWIFT_UPGRADE_CHECK = '1500'
 
     # @return [String] The version of `.xcscheme` files supported by Xcodeproj
     #
@@ -128,6 +132,8 @@ module Xcodeproj
     # @return [Hash] The compatibility version string for different object versions.
     #
     COMPATIBILITY_VERSION_BY_OBJECT_VERSION = {
+      60 => 'Xcode 15.0',
+      56 => 'Xcode 14.0',
       55 => 'Xcode 13.0',
       54 => 'Xcode 12.0',
       53 => 'Xcode 11.4',
@@ -212,6 +218,9 @@ module Xcodeproj
       [:tvos] => {
         'SDKROOT'                           => 'appletvos',
       }.freeze,
+      [:visionos] => {
+        'SDKROOT'                           => 'xros',
+      }.freeze,
       [:watchos] => {
         'SDKROOT'                           => 'watchos',
       }.freeze,

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.23.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/native_target.rb

@@ -112,6 +112,8 @@ module Xcodeproj
             :osx
           elsif sdk.include? 'appletvos'
             :tvos
+          elsif sdk.include? 'xros'
+            :visionos
           elsif sdk.include? 'watchos'
             :watchos
           end
@@ -134,6 +136,7 @@ module Xcodeproj
           :ios => 'IPHONEOS_DEPLOYMENT_TARGET',
           :osx => 'MACOSX_DEPLOYMENT_TARGET',
           :tvos => 'TVOS_DEPLOYMENT_TARGET',
+          :visionos => 'XROS_DEPLOYMENT_TARGET',
           :watchos => 'WATCHOS_DEPLOYMENT_TARGET',
         }.freeze
 
@@ -342,6 +345,10 @@ module Xcodeproj
               group = project.frameworks_group['tvOS'] || project.frameworks_group.new_group('tvOS')
               path_sdk_name = 'AppleTVOS'
               path_sdk_version = sdk_version || Constants::LAST_KNOWN_TVOS_SDK
+            when :visionos
+              group = project.frameworks_group['visionOS'] || project.frameworks_group.new_group('visionOS')
+              path_sdk_name = 'XROS'
+              path_sdk_version = sdk_version || Constants::LAST_KNOWN_VISIONOS_SDK
             when :watchos
               group = project.frameworks_group['watchOS'] || project.frameworks_group.new_group('watchOS')
               path_sdk_name = 'WatchOS'

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/root_object.rb

@@ -62,9 +62,9 @@ module Xcodeproj
         #
         attribute :project_root, String, ''
 
-        # @return [Array<XCRemoteSwiftPackageReference>] the list of Swift package references.
+        # @return [Array<XCRemoteSwiftPackageReference, XCLocalSwiftPackageReference>] the list of Swift package references.
         #
-        has_many :package_references, XCRemoteSwiftPackageReference
+        has_many :package_references, [XCRemoteSwiftPackageReference, XCLocalSwiftPackageReference]
 
         # @return [Array<ObjectDictionary>] any reference to other projects.
         #

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

@@ -0,0 +1,34 @@
+module Xcodeproj
+  class Project
+    module Object
+      # This class represents a local Swift package reference.
+      #
+      class XCLocalSwiftPackageReference < AbstractObject
+        # @!group Attributes
+
+        # @return [String] the repository url this Swift package was installed from.
+        #
+        attribute :path, String
+
+        # @return [String] the repository path where the package is located relative
+        #                  to the Xcode project.
+        #
+        attribute :relative_path, String
+
+        # @!group AbstractObject Hooks
+        #--------------------------------------#
+
+        def ascii_plist_annotation
+          " #{isa} \"#{File.basename(display_name)}\" "
+        end
+
+        # @return [String] the path of the local Swift package reference.
+        #
+        def display_name
+          return relative_path if relative_path
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -6,9 +6,9 @@ module Xcodeproj
       class XCSwiftPackageProductDependency < AbstractObject
         # @!group Attributes
 
-        # @return [XCRemoteSwiftPackageReference] the Swift package reference.
+        # @return [XCRemoteSwiftPackageReference, XCLocalSwiftPackageReference] the Swift package reference.
         #
-        has_one :package, XCRemoteSwiftPackageReference
+        has_one :package, [XCRemoteSwiftPackageReference, XCLocalSwiftPackageReference]
 
         # @return [String] the product name of this Swift package.
         #
@@ -17,7 +17,7 @@ module Xcodeproj
         # @!group AbstractObject Hooks
         #--------------------------------------#
 
-        # @return [String] the name of the Swift package.
+        # @return [String] the name of the Swift package product dependency.
         #
         def display_name
           return product_name if product_name

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

@@ -1,7 +1,7 @@
 module Xcodeproj
   class Project
     module Object
-      # This class represents a Swift package reference.
+      # This class represents a remote Swift package reference.
       #
       class XCRemoteSwiftPackageReference < AbstractObject
         # @!group Attributes
@@ -21,7 +21,7 @@ module Xcodeproj
           " #{isa} \"#{File.basename(display_name)}\" "
         end
 
-        # @return [String] the name of the Swift package repository.
+        # @return [String] the name of the remote Swift package reference.
         #
         def display_name
           return repositoryURL if repositoryURL

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/project/object.rb

@@ -519,6 +519,7 @@ end
 
 # Now load the concrete subclasses.
 require 'xcodeproj/project/object/swift_package_remote_reference'
+require 'xcodeproj/project/object/swift_package_local_reference'
 require 'xcodeproj/project/object/swift_package_product_dependency'
 require 'xcodeproj/project/object/build_configuration'
 require 'xcodeproj/project/object/build_file'

data/lib/xcodeproj/project/project_helper.rb

@@ -284,6 +284,8 @@ module Xcodeproj
             settings['CLANG_ENABLE_OBJC_WEAK'] = 'NO' if deployment_target < '10.7'
           when :tvos
             settings['TVOS_DEPLOYMENT_TARGET'] = deployment_target
+          when :visionos
+            settings['XROS_DEPLOYMENT_TARGET'] = deployment_target
           when :watchos
             settings['WATCHOS_DEPLOYMENT_TARGET'] = deployment_target
           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

data/lib/xcodeproj/xcodebuild_helper.rb

@@ -27,6 +27,13 @@ module Xcodeproj
       versions_by_sdk[:tvos].sort.last
     end
 
+    # @return [String] The version of the last visionOS sdk.
+    #
+    def last_visionos_sdk
+      parse_sdks_if_needed
+      versions_by_sdk[:visionos].sort.last
+    end
+
     # @return [String] The version of the last watchOS sdk.
     #
     def last_watchos_sdk
@@ -53,6 +60,7 @@ module Xcodeproj
         @versions_by_sdk[:osx] = []
         @versions_by_sdk[:ios] = []
         @versions_by_sdk[:tvos] = []
+        @versions_by_sdk[:visionos] = []
         @versions_by_sdk[:watchos] = []
         if xcodebuild_available?
           sdks = parse_sdks_information(xcodebuild_sdks)
@@ -61,6 +69,7 @@ module Xcodeproj
             when name == 'macosx' then @versions_by_sdk[:osx] << version
             when name == 'iphoneos' then @versions_by_sdk[:ios] << version
             when name == 'appletvos' then @versions_by_sdk[:tvos] << version
+            when name == 'xros' then @versions_by_sdk[:visionos] << version
             when name == 'watchos' then @versions_by_sdk[:watchos] << version
             end
           end
@@ -82,7 +91,7 @@ module Xcodeproj
     #         is the name of the SDK and the second is the version.
     #
     def parse_sdks_information(output)
-      output.scan(/-sdk (macosx|iphoneos|watchos|appletvos)(.+\w)/)
+      output.scan(/-sdk (macosx|iphoneos|watchos|appletvos|xros)(.+\w)/)
     end
 
     # @return [String] The sdk information reported by xcodebuild.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomos
@@ -149,6 +149,7 @@ files:
 - lib/xcodeproj/project/object/native_target.rb
 - lib/xcodeproj/project/object/reference_proxy.rb
 - lib/xcodeproj/project/object/root_object.rb
+- lib/xcodeproj/project/object/swift_package_local_reference.rb
 - lib/xcodeproj/project/object/swift_package_product_dependency.rb
 - lib/xcodeproj/project/object/swift_package_remote_reference.rb
 - lib/xcodeproj/project/object/target_dependency.rb
@@ -201,7 +202,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.