xcodeproj 1.17.1 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2adbf62ffb149af02324c1929f3ed398249ab6b0ceed90bf5dd981cb83606a0
-  data.tar.gz: 5384e737db7dabd546677ac0a0d933637e0e23042d32a7523edc935a309b20c6
+  metadata.gz: 7bab98461310ae1a7572bae0b8dd9025cdf12ee53a64c7d457e8d4982d71982d
+  data.tar.gz: 59d1ddc2130ee7f88eb646a1c98dbf14e45da612448a12425df004d416f93961
 SHA512:
-  metadata.gz: ad51d1217443a0e304daa9299f1b8a096e3d854af40b7d0b2cc38a05b8233ceda8b84f66e03145e795f85797c4455d7c33b91c39c10215d276fc596fd160a366
-  data.tar.gz: b070de0c98177aecabf5703ab76f75b96f48375694186b89b59078d0b9cf5aacaba2820492a043523a6b325e2787db79baa60cc39bd515d50836126162b4c33b
+  metadata.gz: 4e2431ba9cbf960b7e1ef53ff3dae65565b51fbba1cbb0c6a096d29251ca49c751403575c46fdae6252e176b8ada16ac5aa659d6b015f142eb338e21718a7a38
+  data.tar.gz: dfe1895012ba35e32dd44b15b4b2cb5e8ab2957eb7919f39a514c7675b8a261a4f4688006ace24e6eae0dcfc07be70392cf047f0cb66bd8f1036bc3fe817f366

data/README.md

@@ -10,7 +10,7 @@ support for Xcode workspaces (`.xcworkspace`), configuration files (`.xcconfig`)
 Xcode Scheme files (`.xcscheme`).
 
 It is used in [CocoaPods](https://github.com/CocoaPods/CocoaPods) to create a
-a collection of supplemental libraries or frameworks, for all platforms Xcode supports.
+collection of supplemental libraries or frameworks, for all platforms Xcode supports.
 
 The API reference can be found [here](http://www.rubydoc.info/gems/xcodeproj).
 

data/lib/xcodeproj/command/sort.rb

@@ -9,22 +9,33 @@ module Xcodeproj
 
       self.summary = 'Sorts the given project.'
 
+      def self.options
+        [
+          ['--group-option=[above|below]', 'The position of the groups when sorting. If no option is specified, sorting will interleave groups and files.'],
+        ].concat(super)
+      end
+
       self.arguments = [
         CLAide::Argument.new('PROJECT', false),
       ]
 
       def initialize(argv)
         self.xcodeproj_path = argv.shift_argument
+        @group_option = argv.option('group-option')
+        @group_option &&= @group_option.to_sym
         super
       end
 
       def validate!
         super
+        unless [nil, :above, :below].include?(@group_option)
+          help! "Unknown format `#{@group_option}`"
+        end
         open_project!
       end
 
       def run
-        xcodeproj.sort
+        xcodeproj.sort(:groups_position => @group_option)
         xcodeproj.save
         puts "The `#{File.basename(xcodeproj_path)}` project was sorted"
       end

data/lib/xcodeproj/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'shellwords'
 require 'xcodeproj/config/other_linker_flags_parser'
 
@@ -58,7 +59,7 @@ module Xcodeproj
       @attributes = {}
       @includes = []
       @other_linker_flags = {}
-      [:simple, :frameworks, :weak_frameworks, :libraries, :force_load].each do |key|
+      [:simple, :frameworks, :weak_frameworks, :libraries, :arg_files, :force_load].each do |key|
         @other_linker_flags[key] = Set.new
       end
       merge!(extract_hash(xcconfig_hash_or_file))
@@ -125,9 +126,10 @@ module Xcodeproj
         :frameworks => '-framework ',
         :weak_frameworks => '-weak_framework ',
         :libraries => '-l',
+        :arg_files => '@',
         :force_load => '-force_load',
       }
-      [:libraries, :frameworks, :weak_frameworks, :force_load].each do |key|
+      [:libraries, :frameworks, :weak_frameworks, :arg_files, :force_load].each do |key|
         modifier = modifiers[key]
         sorted = other_linker_flags[key].to_a.sort
         if key == :force_load
@@ -180,6 +182,13 @@ module Xcodeproj
       other_linker_flags[:libraries]
     end
 
+    # @return [Set<String>] The list of the arg files required by this
+    #         settings file.
+    #
+    def arg_files
+      other_linker_flags[:arg_files]
+    end
+
     public
 
     # @!group Merging
@@ -254,6 +263,7 @@ module Xcodeproj
     # @return [Hash]
     #
     def extract_hash(argument)
+      return argument if argument.is_a?(Hash)
       if argument.respond_to? :read
         @filepath = Pathname.new(argument.to_path)
         hash_from_file_content(argument.read)

data/lib/xcodeproj/config/other_linker_flags_parser.rb

@@ -16,6 +16,7 @@ module Xcodeproj
           :frameworks => [],
           :weak_frameworks => [],
           :libraries => [],
+          :arg_files => [],
           :simple => [],
           :force_load => [],
         }
@@ -32,6 +33,8 @@ module Xcodeproj
             key = :weak_frameworks
           when '-l'
             key = :libraries
+          when '@'
+            key = :arg_files
           when '-force_load'
             key = :force_load
           else
@@ -58,6 +61,8 @@ module Xcodeproj
         flags.strip.shellsplit.flat_map do |string|
           if string =~ /\A-l.+/
             ['-l', string[2..-1]]
+          elsif string =~ /\A@.+/
+            ['@', string[1..-1]]
           else
             string
           end

data/lib/xcodeproj/constants.rb

@@ -4,19 +4,19 @@ module Xcodeproj
   module Constants
     # @return [String] The last known iOS SDK (stable).
     #
-    LAST_KNOWN_IOS_SDK = '12.2'
+    LAST_KNOWN_IOS_SDK = '14.0'
 
     # @return [String] The last known OS X SDK (stable).
     #
-    LAST_KNOWN_OSX_SDK = '10.14'
+    LAST_KNOWN_OSX_SDK = '10.15'
 
     # @return [String] The last known tvOS SDK (stable).
     #
-    LAST_KNOWN_TVOS_SDK = '12.2'
+    LAST_KNOWN_TVOS_SDK = '14.0'
 
     # @return [String] The last known watchOS SDK (stable).
     #
-    LAST_KNOWN_WATCHOS_SDK = '5.2'
+    LAST_KNOWN_WATCHOS_SDK = '7.0'
 
     # @return [String] The last known archive version to Xcodeproj.
     #
@@ -32,15 +32,15 @@ module Xcodeproj
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_KNOWN_OBJECT_VERSION = 54
+    LAST_KNOWN_OBJECT_VERSION = 55
 
-    # @return [String] The last known object version to Xcodeproj.
+    # @return [String] The last known Xcode version to Xcodeproj.
     #
-    LAST_UPGRADE_CHECK = '1100'
+    LAST_UPGRADE_CHECK = '1240'
 
-    # @return [String] The last known object version to Xcodeproj.
+    # @return [String] The last known Xcode version to Xcodeproj.
     #
-    LAST_SWIFT_UPGRADE_CHECK = '1100'
+    LAST_SWIFT_UPGRADE_CHECK = '1240'
 
     # @return [String] The version of `.xcscheme` files supported by Xcodeproj
     #
@@ -93,12 +93,14 @@ module Xcodeproj
       'app'          => 'wrapper.application',
       'appex'        => 'wrapper.app-extension',
       'bundle'       => 'wrapper.plug-in',
+      'cpp'          => 'sourcecode.cpp.cpp',
       'dylib'        => 'compiled.mach-o.dylib',
       'entitlements' => 'text.plist.entitlements',
       'framework'    => 'wrapper.framework',
       'gif'          => 'image.gif',
       'gpx'          => 'text.xml',
       'h'            => 'sourcecode.c.h',
+      'hpp'          => 'sourcecode.cpp.h',
       'm'            => 'sourcecode.c.objc',
       'markdown'     => 'text',
       'mdimporter'   => 'wrapper.cfbundle',
@@ -126,6 +128,7 @@ module Xcodeproj
     # @return [Hash] The compatibility version string for different object versions.
     #
     COMPATIBILITY_VERSION_BY_OBJECT_VERSION = {
+      55 => 'Xcode 13.0',
       54 => 'Xcode 12.0',
       53 => 'Xcode 11.4',
       52 => 'Xcode 11.0',
@@ -140,46 +143,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
@@ -200,11 +205,9 @@ module Xcodeproj
       }.freeze,
       [:ios] => {
         'SDKROOT'                           => 'iphoneos',
-        'CODE_SIGN_IDENTITY'                => 'iPhone Developer',
       }.freeze,
       [:osx] => {
         'SDKROOT'                           => 'macosx',
-        'CODE_SIGN_IDENTITY'                => '-',
       }.freeze,
       [:tvos] => {
         'SDKROOT'                           => 'appletvos',
@@ -253,7 +256,6 @@ module Xcodeproj
       [:debug, :static_library, :swift] => {
       }.freeze,
       [:framework] => {
-        'CODE_SIGN_IDENTITY' => '',
         'CURRENT_PROJECT_VERSION'           => '1',
         'DEFINES_MODULE'                    => 'YES',
         'DYLIB_COMPATIBILITY_VERSION'       => '1',
@@ -271,7 +273,6 @@ module Xcodeproj
       }.freeze,
       [:osx, :framework] => {
         'COMBINE_HIDPI_IMAGES'              => 'YES',
-        'FRAMEWORK_VERSION'                 => 'A',
         'LD_RUNPATH_SEARCH_PATHS'           => '$(inherited) @executable_path/../Frameworks @loader_path/Frameworks',
       }.freeze,
       [:watchos, :framework] => {
@@ -313,6 +314,7 @@ module Xcodeproj
       }.freeze,
       [:application] => {
         'ASSETCATALOG_COMPILER_APPICON_NAME' => 'AppIcon',
+        'ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME'  => 'AccentColor',
       }.freeze,
       [:ios, :application] => {
         'LD_RUNPATH_SEARCH_PATHS'           => '$(inherited) @executable_path/Frameworks',
@@ -328,10 +330,12 @@ module Xcodeproj
       }.freeze,
       [:tvos, :application] => {
         'ASSETCATALOG_COMPILER_APPICON_NAME' => 'App Icon & Top Shelf Image',
-        'ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME' => 'LaunchImage',
         'LD_RUNPATH_SEARCH_PATHS'           => '$(inherited) @executable_path/Frameworks',
         'TARGETED_DEVICE_FAMILY'            => '3',
       }.freeze,
+      [:tvos, :application, :swift] => {
+        'ENABLE_PREVIEWS'                                 => 'YES',
+      }.freeze,
       [:watchos, :application, :swift] => {
         'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'YES',
       }.freeze,
@@ -377,6 +381,7 @@ module Xcodeproj
         'CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF'    => 'YES',
         'CLANG_WARN_OBJC_LITERAL_CONVERSION'      => 'YES',
         'CLANG_WARN_OBJC_ROOT_CLASS'              => 'YES_ERROR',
+        'CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER' => 'YES',
         'CLANG_WARN_RANGE_LOOP_ANALYSIS'          => 'YES',
         'CLANG_WARN_STRICT_PROTOTYPES'            => 'YES',
         'CLANG_WARN_SUSPICIOUS_MOVE'              => 'YES',
@@ -449,5 +454,12 @@ module Xcodeproj
       $(inherited)
       ${inherited}
     ).freeze
+
+    # @return [Hash] Possible types for a scheme's 'ExecutionAction' node
+    #
+    EXECUTION_ACTION_TYPE = {
+      :shell_script  => 'Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction',
+      :send_email    => 'Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.SendEmailAction',
+    }.freeze
   end
 end

data/lib/xcodeproj/gem_version.rb

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

data/lib/xcodeproj/project.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'atomos'
 require 'fileutils'
 require 'securerandom'
@@ -220,11 +221,11 @@ module Xcodeproj
       end
 
       if archive_version.to_i > Constants::LAST_KNOWN_ARCHIVE_VERSION
-        raise '[Xcodeproj] Unknown archive version.'
+        raise "[Xcodeproj] Unknown archive version (#{archive_version.to_i})."
       end
 
       if object_version.to_i > Constants::LAST_KNOWN_OBJECT_VERSION
-        raise '[Xcodeproj] Unknown object version.'
+        raise "[Xcodeproj] Unknown object version (#{object_version.to_i})."
       end
 
       # Projects can have product_ref_groups that are not listed in the main_groups["Products"]
@@ -711,9 +712,10 @@ module Xcodeproj
     #
     # @return [PBXNativeTarget] the target.
     #
-    def new_target(type, name, platform, deployment_target = nil, product_group = nil, language = nil)
+    def new_target(type, name, platform, deployment_target = nil, product_group = nil, language = nil, product_basename = nil)
       product_group ||= products_group
-      ProjectHelper.new_target(self, type, name, platform, deployment_target, product_group, language)
+      product_basename ||= name
+      ProjectHelper.new_target(self, type, name, platform, deployment_target, product_group, language, product_basename)
     end
 
     # Creates a new resource bundles target and adds it to the project.
@@ -731,9 +733,10 @@ module Xcodeproj
     #
     # @return [PBXNativeTarget] the target.
     #
-    def new_resources_bundle(name, platform, product_group = nil)
+    def new_resources_bundle(name, platform, product_group = nil, product_basename = nil)
       product_group ||= products_group
-      ProjectHelper.new_resources_bundle(self, name, platform, product_group)
+      product_basename ||= name
+      ProjectHelper.new_resources_bundle(self, name, platform, product_group, product_basename)
     end
 
     # Creates a new target and adds it to the project.

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

@@ -39,6 +39,10 @@ module Xcodeproj
         #
         attribute :platform_filter, String
 
+        # @return [Array<String>] the platform filters for this build file.
+        #
+        attribute :platform_filters, Array
+
         #---------------------------------------------------------------------#
 
         public
@@ -49,7 +53,9 @@ module Xcodeproj
         #         user.
         #
         def display_name
-          if file_ref
+          if product_ref
+            product_ref.display_name
+          elsif file_ref
             file_ref.display_name
           else
             super

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

@@ -30,6 +30,16 @@ module Xcodeproj
         #
         attribute :run_only_for_deployment_postprocessing, String, '0'
 
+        # @return [String] whether or not this run script will be forced to
+        #         run even on incremental builds. Can be either '1', or
+        #         missing. By default this option is disabled in Xcode.
+        #
+        # @note   This setting is exposed in Xcode in the UI of
+        #         PBXShellScriptBuildPhase as `Based on
+        #         dependency analysis` (selected by default).
+        #
+        attribute :always_out_of_date, String
+
         # @return [String] Comments associated with this build phase.
         #
         # @note   This is apparently no longer used by Xcode.
@@ -135,6 +145,27 @@ module Xcodeproj
         def ascii_plist_annotation
           " #{display_name} "
         end
+
+        # Sorts the build files of the phase according to the display
+        # name or the path.
+        #
+        # @param  [Hash] _options
+        #         Not used.
+        #
+        # @return [void]
+        #
+        def sort(_options = nil)
+          files.sort! do |x, y|
+            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? && x.file_ref.respond_to?(:full_path) && y.file_ref.respond_to?(:full_path)
+                result = x.file_ref.full_path.to_s.downcase <=> y.file_ref.full_path.to_s.downcase
+              end
+            end
+            result
+          end
+        end
       end
 
       #-----------------------------------------------------------------------#