xcodeproj 1.14.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3af9cb46ce94c2bb3e0bff2b7b28e82f5a037788378fa512274f685d41c2910b
-  data.tar.gz: 4047b7ac654f2aaeaba3363e56362249c2ce4456cea8e73eb27cd731648d4792
+  metadata.gz: 7bab98461310ae1a7572bae0b8dd9025cdf12ee53a64c7d457e8d4982d71982d
+  data.tar.gz: 59d1ddc2130ee7f88eb646a1c98dbf14e45da612448a12425df004d416f93961
 SHA512:
-  metadata.gz: c47d7f26b3c3078f7cf2094aa81fd809cf938d9741530d09c166a37b3bc0a98e9e4e59e2b51222d1c43b64f9620ff35c0c83077ca6331b49bebed117fa6891f8
-  data.tar.gz: 65a27789a94d192a1d7c25c851d3ab36fab276f70145432c5a1ca3ecd398ca6f571206aee498d59c05dc688542ca2facd4bac7de08845a936e8cb54452c3073e
+  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/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/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/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 = 52
+    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,9 @@ 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',
       51 => 'Xcode 10.0',
       50 => 'Xcode 9.3',
@@ -138,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
@@ -198,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',
@@ -251,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',
@@ -269,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] => {
@@ -311,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',
@@ -326,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,
@@ -375,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',
@@ -447,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.14.0'.freeze unless defined? Xcodeproj::VERSION
+  VERSION = '1.21.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/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
 
       #-----------------------------------------------------------------------#

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

@@ -226,24 +226,24 @@ module Xcodeproj
         # Creates a file reference to a static library and adds it to the
         # group.
         #
-        # @param  [#to_s] product_name
+        # @param  [#to_s] product_basename
         #         The name of the static library.
         #
         # @return [PBXFileReference] The new file reference.
         #
-        def new_product_ref_for_target(target_name, product_type)
-          FileReferencesFactory.new_product_ref_for_target(self, target_name, product_type)
+        def new_product_ref_for_target(product_basename, product_type)
+          FileReferencesFactory.new_product_ref_for_target(self, product_basename, product_type)
         end
 
         # Creates a file reference to a new bundle.
         #
-        # @param  [#to_s] product_name
+        # @param  [#to_s] product_basename
         #         The name of the bundle.
         #
         # @return [PBXFileReference] The new file reference.
         #
-        def new_bundle(product_name)
-          FileReferencesFactory.new_bundle(self, product_name)
+        def new_bundle(product_basename)
+          FileReferencesFactory.new_bundle(self, product_basename)
         end
 
         # Creates a file reference to a new bundle and adds it to the group.
@@ -440,10 +440,12 @@ module Xcodeproj
 
             result = File.basename(x.display_name.downcase, '.*') <=> File.basename(y.display_name.downcase, '.*')
             if result.zero?
-              File.extname(x.display_name.downcase) <=> File.extname(y.display_name.downcase)
-            else
-              result
+              result = File.extname(x.display_name.downcase) <=> File.extname(y.display_name.downcase)
+              if result.zero?
+                result = x.path.downcase <=> y.path.downcase
+              end
             end
+            result
           end
         end
       end

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

@@ -42,17 +42,19 @@ module Xcodeproj
           # @param  [PBXGroup] group
           #         The group to which to add the reference.
           #
-          # @param  [#to_s] product_name
+          # @param  [#to_s] product_basename
           #         The name of the static library.
           #
           # @return [PBXFileReference] The new file reference.
           #
-          def new_product_ref_for_target(group, target_name, product_type)
+          def new_product_ref_for_target(group, product_basename, product_type)
             if product_type == :static_library
               prefix = 'lib'
             end
             extension = Constants::PRODUCT_UTI_EXTENSIONS[product_type]
-            ref = new_reference(group, "#{prefix}#{target_name}.#{extension}", :built_products)
+            path = "#{prefix}#{product_basename}"
+            path += ".#{extension}" if extension
+            ref = new_reference(group, path, :built_products)
             ref.include_in_index = '0'
             ref.set_explicit_file_type
             ref
@@ -64,13 +66,13 @@ module Xcodeproj
           # @param  [PBXGroup] group
           #         The group to which to add the reference.
           #
-          # @param  [#to_s] product_name
+          # @param  [#to_s] product_basename
           #         The name of the bundle.
           #
           # @return [PBXFileReference] The new file reference.
           #
-          def new_bundle(group, product_name)
-            ref = new_reference(group, "#{product_name}.bundle", :built_products)
+          def new_bundle(group, product_basename)
+            ref = new_reference(group, "#{product_basename}.bundle", :built_products)
             ref.include_in_index = '0'
             ref.set_explicit_file_type('wrapper.cfbundle')
             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
@@ -205,7 +205,7 @@ module Xcodeproj
           # @return [void]
           #
           def set_path_with_source_tree(object, path, source_tree)
-            path = Pathname.new(path)
+            path = Pathname(path)
             source_tree = normalize_source_tree(source_tree)
             object.source_tree = source_tree