xcodeproj 0.24.3 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45749514086eccfd41add94a597a28e8a2df422c
-  data.tar.gz: ef49f2cf25c13086e45ce900af380f55f1132c4d
+  metadata.gz: 3f8b59744123dd288ccf5eed2303ce6e9ff441b6
+  data.tar.gz: e808faecace05daf138478734b8f737e648eda70
 SHA512:
-  metadata.gz: 2818dbb5919f5b147fc0f704b18841a83e57078e3232d293a9598b2b799cb92165ae2169becb20bdeb0d3b050bdeb99ce8590bca42152e133b26aa86e6d7eeab
-  data.tar.gz: 015dbf4161e72b8f33877035743dac4d59468584aa1e8081021e9a2f0e96201c745d334c3b309ffb83aa5509e740f588e951ba7fc41a9b18b38be8c8862950aa
+  metadata.gz: 0ac442b8dd9088340357b5d30c1330a6aff37bb63922fe43e1e5d9ab6f8e7fe9fb8fa6766bdcd8494d6ccb310fa3c10afe4c40148a1791546523771468fb1e70
+  data.tar.gz: dc0cd72c4c6c781c97e327837401b5ee0d66317a61ff7ed8c999a63fe34ea6c3cf77b0824a19a8d695345c16b9fa6c077587e182a96b6f5f5acf9a51c448b59d

data/lib/xcodeproj/command/config_dump.rb

@@ -2,6 +2,7 @@ module Xcodeproj
   class Command
     class ConfigDump < Command
       def self.banner
+        require 'active_support/core_ext/string/strip.rb'
         <<-eos.strip_heredoc
         Dumps the build settings of all project targets for all configurations in
         directories named by the target in given output directory.

data/lib/xcodeproj/constants.rb

@@ -10,6 +10,9 @@ module Xcodeproj
     #
     LAST_KNOWN_OSX_SDK  = '10.10'
 
+    # @return [String] The last known watchOS SDK (unstable).
+    LAST_KNOWN_WATCHOS_SDK = '2.0'
+
     # @return [String] The last known archive version to Xcodeproj.
     #
     LAST_KNOWN_ARCHIVE_VERSION = 1
@@ -23,7 +26,11 @@ module Xcodeproj
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_UPGRADE_CHECK  = '0640'
+    LAST_UPGRADE_CHECK  = '0700'
+
+    # @return [String] The last known object version to Xcodeproj.
+    #
+    LAST_SWIFT_UPGRADE_CHECK = '0700'
 
     # @return [Hash] The all the known ISAs grouped by superclass.
     #
@@ -101,7 +108,9 @@ module Xcodeproj
       :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',
       :watch_extension   => 'com.apple.product-type.watchkit-extension',
+      :watch2_extension  => 'com.apple.product-type.watchkit2-extension',
     }.freeze
 
     # @return [Hash] The extensions or the various product UTIs.
@@ -134,6 +143,9 @@ module Xcodeproj
       [:osx] => {
         'SDKROOT'                           => 'macosx',
       }.freeze,
+      [:watchos] => {
+        'SDKROOT'                           => 'watchos',
+      }.freeze,
       [:debug, :osx] => {
         # Empty?
       }.freeze,
@@ -145,6 +157,16 @@ module Xcodeproj
       }.freeze,
       [:debug, :application, :swift] => {
         'SWIFT_OPTIMIZATION_LEVEL'          => '-Onone',
+        'ENABLE_TESTABILITY'                => 'YES',
+      }.freeze,
+      [:debug, :dynamic_library, :swift] => {
+        'ENABLE_TESTABILITY'                => 'YES',
+      }.freeze,
+      [:debug, :framework, :swift] => {
+        'ENABLE_TESTABILITY'                => 'YES',
+      }.freeze,
+      [:debug, :static_library, :swift] => {
+        'ENABLE_TESTABILITY'                => 'YES',
       }.freeze,
       [:framework] => {
         'VERSION_INFO_PREFIX'               => '',

data/lib/xcodeproj/gem_version.rb

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

data/lib/xcodeproj/plist_helper.rb

@@ -642,14 +642,10 @@ module DevToolsCore
       nil
   end
 
-  # @note The IB frameworks only seem to be necessary on Xcode 7+
-  #
   def self.load_xcode_frameworks
     load_xcode_framework('SharedFrameworks/DVTFoundation.framework/DVTFoundation')
     load_xcode_framework('SharedFrameworks/DVTSourceControl.framework/DVTSourceControl')
     load_xcode_framework('SharedFrameworks/CSServiceClient.framework/CSServiceClient')
-    load_xcode_framework('Frameworks/IBFoundation.framework/IBFoundation')
-    load_xcode_framework('Frameworks/IBAutolayoutFoundation.framework/IBAutolayoutFoundation')
     load_xcode_framework('Frameworks/IDEFoundation.framework/IDEFoundation')
     load_xcode_framework('PlugIns/Xcode3Core.ideplugin/Contents/MacOS/Xcode3Core')
   end
@@ -703,6 +699,8 @@ module DevToolsCore
     def initialize(path)
       DevToolsCore.silence_stderr do
         CoreFoundation.IDEInitialize(1, CoreFoundation::NULL)
+
+        # The parameter is whether UI must be initialized (which we don't need)
         CoreFoundation.XCInitializeCoreIfNeeded(0)
       end
 

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

@@ -93,6 +93,8 @@ module Xcodeproj
             :ios
           elsif sdk.include? 'macosx'
             :osx
+          elsif sdk.include? 'watchos'
+            :watchos
           end
         end
 
@@ -108,10 +110,10 @@ module Xcodeproj
         #         platform.
         #
         def deployment_target
-          if platform_name == :ios
-            common_resolved_build_setting('IPHONEOS_DEPLOYMENT_TARGET')
-          else
-            common_resolved_build_setting('MACOSX_DEPLOYMENT_TARGET')
+          case platform_name
+          when :ios then common_resolved_build_setting('IPHONEOS_DEPLOYMENT_TARGET')
+          when :osx then common_resolved_build_setting('MACOSX_DEPLOYMENT_TARGET')
+          when :watchos then common_resolved_build_setting('WATCHOS_DEPLOYMENT_TARGET')
           end
         end
 
@@ -294,6 +296,10 @@ module Xcodeproj
               group = project.frameworks_group['OS X'] || project.frameworks_group.new_group('OS X')
               path_sdk_name = 'MacOSX'
               path_sdk_version = sdk_version || Constants::LAST_KNOWN_OSX_SDK
+            when :watchos
+              group = project.frameworks_group['watchOS'] || project.frameworks_group.new_group('watchOS')
+              path_sdk_name = 'WatchOS'
+              path_sdk_version = sdk_version || Constants::LAST_KNOWN_WATCHOS_SDK
             else
               raise 'Unknown platform for target'
             end
@@ -398,7 +404,7 @@ module Xcodeproj
         #         the files references of the source files that should be added
         #         to the target.
         #
-        # @param  [Hash{String=>String}] compiler_flags
+        # @param  [String] compiler_flags
         #         the compiler flags for the source files.
         #
         # @yield_param [PBXBuildFile] each created build file.
@@ -407,18 +413,21 @@ module Xcodeproj
         #
         def add_file_references(file_references, compiler_flags = {})
           file_references.map do |file|
-            build_file = project.new(PBXBuildFile)
-            build_file.file_ref = file
-
             extension = File.extname(file.path).downcase
             header_extensions = Constants::HEADER_FILES_EXTENSIONS
-            if header_extensions.include?(extension)
-              headers_build_phase.files << build_file
-            else
-              if compiler_flags && !compiler_flags.empty?
-                build_file.settings = { 'COMPILER_FLAGS' => compiler_flags }
+            is_header_phase = header_extensions.include?(extension)
+            phase = is_header_phase ? headers_build_phase : source_build_phase
+
+            unless build_file = phase.build_file(file)
+              build_file = project.new(PBXBuildFile)
+              build_file.file_ref = file
+              phase.files << build_file
+            end
+
+            if compiler_flags && !compiler_flags.empty? && !is_header_phase
+              (build_file.settings ||= {}).merge!('COMPILER_FLAGS' => compiler_flags) do |_, old, new|
+                [old, new].compact.join(' ')
               end
-              source_build_phase.files << build_file
             end
 
             yield build_file if block_given?
@@ -436,6 +445,7 @@ module Xcodeproj
         #
         def add_resources(resource_file_references)
           resource_file_references.each do |file|
+            next if resources_build_phase.include?(file)
             build_file = project.new(PBXBuildFile)
             build_file.file_ref = file
             resources_build_phase.files << build_file

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

@@ -20,7 +20,9 @@ module Xcodeproj
         #         - `LastUpgradeCheck`
         #         - `ORGANIZATIONNAME`
         #
-        attribute :attributes, Hash, 'LastUpgradeCheck' => Constants::LAST_UPGRADE_CHECK
+        attribute :attributes, Hash,
+                  'LastSwiftUpdateCheck' => Constants::LAST_SWIFT_UPGRADE_CHECK,
+                  'LastUpgradeCheck' => Constants::LAST_UPGRADE_CHECK
 
         # @return [XCConfigurationList] the configuration list of the project.
         #

data/lib/xcodeproj/project/project_helper.rb

@@ -59,7 +59,7 @@ module Xcodeproj
         target.build_phases << project.new(PBXFrameworksBuildPhase)
 
         # Frameworks
-        framework_name = (platform == :ios) ? 'Foundation' : 'Cocoa'
+        framework_name = (platform == :osx) ? 'Cocoa' : 'Foundation'
         target.add_system_framework(framework_name)
 
         target
@@ -234,10 +234,10 @@ module Xcodeproj
         end
 
         if deployment_target
-          if platform == :ios
-            settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
-          elsif platform == :osx
-            settings['MACOSX_DEPLOYMENT_TARGET'] = deployment_target
+          case platform
+          when :ios then settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
+          when :osx then settings['MACOSX_DEPLOYMENT_TARGET'] = deployment_target
+          when :watchos then settings['WATCHOS_DEPLOYMENT_TARGET'] = deployment_target
           end
         end
 

data/lib/xcodeproj/scheme.rb

@@ -33,6 +33,8 @@ module Xcodeproj
       @test_action.attributes['shouldUseLaunchSchemeArgsEnv'] = 'YES'
       @test_action.attributes['buildConfiguration'] = 'Debug'
 
+      @test_action_additional_options = @test_action.add_element 'AdditionalOptions'
+
       @testables = @test_action.add_element 'Testables'
 
       @launch_action = @scheme.add_element 'LaunchAction'
@@ -43,6 +45,7 @@ module Xcodeproj
       @launch_action.attributes['buildConfiguration'] = 'Debug'
       @launch_action.attributes['ignoresPersistentStateOnLaunch'] = 'NO'
       @launch_action.attributes['debugDocumentVersioning'] = 'YES'
+      @launch_action.attributes['debugServiceExtension'] = 'internal'
       @launch_action.attributes['allowLocationSimulation'] = 'YES'
       @launch_action.add_element('AdditionalOptions')
 
@@ -117,6 +120,7 @@ module Xcodeproj
     #
     def set_launch_target(build_target)
       launch_product_runnable = @launch_action.add_element 'BuildableProductRunnable'
+      launch_product_runnable.attributes['runnableDebuggingMode'] = '0'
 
       launch_buildable_reference = launch_product_runnable.add_element 'BuildableReference'
       launch_buildable_reference.attributes['BuildableIdentifier'] = 'primary'

data/lib/xcodeproj/xcodebuild_helper.rb

@@ -10,14 +10,21 @@ module Xcodeproj
     #
     def last_ios_sdk
       parse_sdks_if_needed
-      verions_by_sdk[:ios].sort.last
+      versions_by_sdk[:ios].sort.last
     end
 
     # @return [String] The version of the last OS X sdk.
     #
     def last_osx_sdk
       parse_sdks_if_needed
-      verions_by_sdk[:osx].sort.last
+      versions_by_sdk[:osx].sort.last
+    end
+
+    # @return [String] The version of the last watchOS sdk.
+    #
+    def last_watchos_sdk
+      parse_sdks_if_needed
+      versions_by_sdk[:watchos].sort.last
     end
 
     private
@@ -28,22 +35,24 @@ module Xcodeproj
 
     # @return [Hash] The versions of the sdks grouped by name (`:ios`, or `:osx`).
     #
-    attr_accessor :verions_by_sdk
+    attr_accessor :versions_by_sdk
 
     # @return [void] Parses the SDKs returned by xcodebuild and stores the
     #         information in the `needs_to_parse_sdks` hash.
     #
     def parse_sdks_if_needed
       if @needs_to_parse_sdks
-        @verions_by_sdk = {}
-        @verions_by_sdk[:osx] = []
-        @verions_by_sdk[:ios] = []
+        @versions_by_sdk = {}
+        @versions_by_sdk[:osx] = []
+        @versions_by_sdk[:ios] = []
+        @versions_by_sdk[:watchos] = []
         if xcodebuild_available?
-          skds = parse_sdks_information(xcodebuild_sdks)
-          skds.each do |(name, version)|
+          sdks = parse_sdks_information(xcodebuild_sdks)
+          sdks.each do |(name, version)|
             case
-            when name == 'macosx' then @verions_by_sdk[:osx] << version
-            when name == 'iphoneos' then @verions_by_sdk[:ios] << version
+            when name == 'macosx' then @versions_by_sdk[:osx] << version
+            when name == 'iphoneos' then @versions_by_sdk[:ios] << version
+            when name == 'watchos' then @versions_by_sdk[:watchos] << version
             end
           end
         end
@@ -64,7 +73,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)(.+\w)/)
+      output.scan(/-sdk (macosx|iphoneos|watchos)(.+\w)/)
     end
 
     # @return [String] The sdk information reported by xcodebuild.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -14,28 +14,28 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script
@@ -100,12 +100,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []