xcodeproj 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9084e7a80a61cbf7fe8fef7da730e4d3c9ff90b1
-  data.tar.gz: 3dbcdcd622aa7c288d92c570e0a882ac24fd28cb
+  metadata.gz: d69e019d682b09834105316249157ff2f8e8ce16
+  data.tar.gz: 070eebafd685abfdcc50312ef3276c8e37e4aa95
 SHA512:
-  metadata.gz: 56453fae972dbbc49bda896460fd976a9028e0a5fab6e801195435eea2aa85e834ef12f113651c2ee9e41045dc6c2944b43e6bfe9709a746bfc821f0cdfd5267
-  data.tar.gz: b5b0a96286a6364d1061c8e1838bc66c8c979594cd50c3059d04ef5ac269b10b6f91dcbe2a288cf42e8a1e6a1c70a4bf0c1e03eef54dd1b9793a25ba1870ab2b
+  metadata.gz: 99515f622edb41f755d5a0212c656393c4e7bd7cbf6c6fc732cccc847ade8d8ce342cb0b47ff34be1be44625ebc43c5f77f489fd652bdea9df3d7998ce9d0ae3
+  data.tar.gz: 7a686f38cd6f43a1c0ab58037785e9e953444a728c40115b5df3ebae58eed82892c7742f085118ba50355094fae3090f96e7021739c6077153f214b90fdd5278

data/lib/xcodeproj/constants.rb

@@ -20,6 +20,10 @@ module Xcodeproj
     #
     LAST_KNOWN_ARCHIVE_VERSION = 1
 
+    # @return [String] The last known Swift version (stable).
+    #
+    LAST_KNOWN_SWIFT_VERSION = '3.0'
+
     # @return [String] The default object version for Xcodeproj.
     DEFAULT_OBJECT_VERSION = 46
 
@@ -160,23 +164,24 @@ module Xcodeproj
     #
     COMMON_BUILD_SETTINGS = {
       :all => {
-        'ENABLE_STRICT_OBJC_MSGSEND'        => 'YES',
-        'GCC_NO_COMMON_BLOCKS'              => 'YES',
-        'PRODUCT_NAME'                      => '$(TARGET_NAME)',
+        # empty?
+        # come from the project settings
       }.freeze,
       [:debug] => {
-        'DEBUG_INFORMATION_FORMAT'          => 'dwarf',
-        'MTL_ENABLE_DEBUG_INFO'             => 'YES',
+        # empty?
+        # come from the project settings
       }.freeze,
       [:release] => {
-        'DEBUG_INFORMATION_FORMAT'          => 'dwarf-with-dsym',
-        'MTL_ENABLE_DEBUG_INFO'             => 'NO',
+        # empty?
+        # come from the project settings
       }.freeze,
       [:ios] => {
         'SDKROOT'                           => 'iphoneos',
+        'CODE_SIGN_IDENTITY'                => 'iPhone Developer',
       }.freeze,
       [:osx] => {
         'SDKROOT'                           => 'macosx',
+        'CODE_SIGN_IDENTITY'                => '-',
       }.freeze,
       [:tvos] => {
         'SDKROOT'                           => 'appletvos',
@@ -193,8 +198,25 @@ module Xcodeproj
       [:debug, :ios] => {
         # Empty?
       }.freeze,
+      [:release, :ios] => {
+        'VALIDATE_PRODUCT' => 'YES',
+      }.freeze,
+      [:debug, :tvos] => {
+        # Empty?
+      }.freeze,
+      [:release, :tvos] => {
+        'VALIDATE_PRODUCT' => 'YES',
+      }.freeze,
+      [:debug, :watchos] => {
+        # Empty?
+      }.freeze,
+      [:release, :watchos] => {
+        'VALIDATE_PRODUCT' => 'YES',
+      }.freeze,
       [:swift] => {
-        'SWIFT_VERSION'                       => '3.0',
+        # Empty?
+        # The swift version, like deployment target, is set in
+        # ProjectHelper#common_build_settings
       }.freeze,
       [:debug, :application, :swift] => {
         'SWIFT_OPTIMIZATION_LEVEL'          => '-Onone',
@@ -209,61 +231,58 @@ module Xcodeproj
       [:debug, :static_library, :swift] => {
       }.freeze,
       [:framework] => {
-        'VERSION_INFO_PREFIX'               => '',
-        'DYLIB_COMPATIBILITY_VERSION'       => '1',
-        'DEFINES_MODULE'                    => 'YES',
-        'DYLIB_INSTALL_NAME_BASE'           => '@rpath',
+        'CODE_SIGN_IDENTITY' => '',
         'CURRENT_PROJECT_VERSION'           => '1',
-        'VERSIONING_SYSTEM'                 => 'apple-generic',
+        'DEFINES_MODULE'                    => 'YES',
+        'DYLIB_COMPATIBILITY_VERSION'       => '1',
         'DYLIB_CURRENT_VERSION'             => '1',
-        'SKIP_INSTALL'                      => 'YES',
+        'DYLIB_INSTALL_NAME_BASE'           => '@rpath',
         'INSTALL_PATH'                      => '$(LOCAL_LIBRARY_DIR)/Frameworks',
+        'PRODUCT_NAME'                      => '$(TARGET_NAME:c99extidentifier)',
+        'SKIP_INSTALL'                      => 'YES',
+        'VERSION_INFO_PREFIX'               => '',
+        'VERSIONING_SYSTEM'                 => 'apple-generic',
       }.freeze,
       [:ios, :framework] => {
-        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks', '@loader_path/Frameworks'],
-        'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => 'iPhone Developer',
+        'LD_RUNPATH_SEARCH_PATHS'           => '$(inherited) @executable_path/Frameworks @loader_path/Frameworks',
         'TARGETED_DEVICE_FAMILY'            => '1,2',
-        'CODE_SIGN_IDENTITY'                => '',
       }.freeze,
       [:osx, :framework] => {
-        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/../Frameworks', '@loader_path/Frameworks'],
-        'FRAMEWORK_VERSION'                 => 'A',
-        'CODE_SIGN_IDENTITY'                => '-',
         'COMBINE_HIDPI_IMAGES'              => 'YES',
+        'FRAMEWORK_VERSION'                 => 'A',
+        'LD_RUNPATH_SEARCH_PATHS'           => '$(inherited) @executable_path/../Frameworks @loader_path/Frameworks',
       }.freeze,
       [:watchos, :framework] => {
         'APPLICATION_EXTENSION_API_ONLY'    => 'YES',
-        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks', '@loader_path/Frameworks'],
+        'LD_RUNPATH_SEARCH_PATHS'           => '$(inherited) @executable_path/Frameworks @loader_path/Frameworks',
         'TARGETED_DEVICE_FAMILY'            => '4',
-        'CODE_SIGN_IDENTITY'                => '',
       }.freeze,
       [:tvos, :framework] => {
-        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks', '@loader_path/Frameworks'],
+        'LD_RUNPATH_SEARCH_PATHS'           => '$(inherited) @executable_path/Frameworks @loader_path/Frameworks',
         'TARGETED_DEVICE_FAMILY'            => '3',
-        'CODE_SIGN_IDENTITY'                => '',
       }.freeze,
       [:framework, :swift] => {
         'DEFINES_MODULE'                    => 'YES',
       }.freeze,
       [:osx, :static_library] => {
-        'CODE_SIGN_IDENTITY'                => '-',
         'EXECUTABLE_PREFIX'                 => 'lib',
       }.freeze,
       [:ios, :static_library] => {
-        'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => 'iPhone Developer',
         'OTHER_LDFLAGS'                     => '-ObjC',
         'SKIP_INSTALL'                      => 'YES',
+        'TARGETED_DEVICE_FAMILY'            => '1,2',
       }.freeze,
       [:watchos, :static_library] => {
         'OTHER_LDFLAGS'                     => '-ObjC',
         'SKIP_INSTALL'                      => 'YES',
+        'TARGETED_DEVICE_FAMILY'            => '4',
       }.freeze,
       [:tvos, :static_library] => {
         'OTHER_LDFLAGS'                     => '-ObjC',
         'SKIP_INSTALL'                      => 'YES',
+        'TARGETED_DEVICE_FAMILY'            => '3',
       }.freeze,
       [:osx, :dynamic_library] => {
-        'CODE_SIGN_IDENTITY'                => '-',
         'DYLIB_COMPATIBILITY_VERSION'       => '1',
         'DYLIB_CURRENT_VERSION'             => '1',
         'EXECUTABLE_PREFIX'                 => 'lib',
@@ -272,14 +291,12 @@ module Xcodeproj
         'ASSETCATALOG_COMPILER_APPICON_NAME' => 'AppIcon',
       }.freeze,
       [:ios, :application] => {
-        'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => 'iPhone Developer',
-        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks'],
+        'LD_RUNPATH_SEARCH_PATHS'           => '$(inherited) @executable_path/Frameworks',
         'TARGETED_DEVICE_FAMILY'            => '1,2',
       }.freeze,
       [:osx, :application] => {
         'COMBINE_HIDPI_IMAGES'              => 'YES',
-        'CODE_SIGN_IDENTITY'                => '-',
-        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/../Frameworks'],
+        'LD_RUNPATH_SEARCH_PATHS'           => '$(inherited) @executable_path/../Frameworks',
       }.freeze,
       [:watchos, :application] => {
         'SKIP_INSTALL'                      => 'YES',
@@ -288,14 +305,13 @@ module Xcodeproj
       [: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',
-        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks'],
       }.freeze,
       [:watchos, :application, :swift] => {
         'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'YES',
       }.freeze,
       [:bundle] => {
-        'PRODUCT_NAME'                      => '$(TARGET_NAME)',
         'WRAPPER_EXTENSION'                 => 'bundle',
         'SKIP_INSTALL'                      => 'YES',
       }.freeze,
@@ -303,7 +319,6 @@ module Xcodeproj
         'SDKROOT'                           => 'iphoneos',
       }.freeze,
       [:osx, :bundle] => {
-        'CODE_SIGN_IDENTITY'                => '-',
         'COMBINE_HIDPI_IMAGES'              => 'YES',
         'INSTALL_PATH'                      => '$(LOCAL_LIBRARY_DIR)/Bundles',
         'SDKROOT'                           => 'macosx',
@@ -316,43 +331,54 @@ module Xcodeproj
       :all => {
         'ALWAYS_SEARCH_USER_PATHS'                => 'NO',
         'CLANG_ANALYZER_NONNULL'                  => 'YES',
-        'CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION' => 'YES',
-        'CLANG_CXX_LANGUAGE_STANDARD'             => 'gnu++0x',
+        'CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION' => 'YES_AGGRESSIVE',
+        'CLANG_CXX_LANGUAGE_STANDARD'             => 'gnu++14',
         'CLANG_CXX_LIBRARY'                       => 'libc++',
         'CLANG_ENABLE_MODULES'                    => 'YES',
         'CLANG_ENABLE_OBJC_ARC'                   => 'YES',
         'CLANG_WARN__DUPLICATE_METHOD_MATCH'      => 'YES',
+        'CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING'  => 'YES',
         'CLANG_WARN_BOOL_CONVERSION'              => 'YES',
+        'CLANG_WARN_COMMA'                        => 'YES',
         'CLANG_WARN_CONSTANT_CONVERSION'          => 'YES',
-        'CLANG_WARN_DIRECT_OBJC_ISA_USAGE'        => 'YES',
+        'CLANG_WARN_DIRECT_OBJC_ISA_USAGE'        => 'YES_ERROR',
+        'CLANG_WARN_DOCUMENTATION_COMMENTS'       => 'YES',
         'CLANG_WARN_EMPTY_BODY'                   => 'YES',
         'CLANG_WARN_ENUM_CONVERSION'              => 'YES',
-        'CLANG_WARN_INT_CONVERSION'               => 'YES',
-        'CLANG_WARN_OBJC_ROOT_CLASS'              => 'YES',
-        'CLANG_WARN_UNREACHABLE_CODE'             => 'YES',
-        'CLANG_WARN_DOCUMENTATION_COMMENTS'       => 'YES',
         'CLANG_WARN_INFINITE_RECURSION'           => 'YES',
+        'CLANG_WARN_INT_CONVERSION'               => 'YES',
+        'CLANG_WARN_NON_LITERAL_NULL_CONVERSION'  => 'YES',
+        'CLANG_WARN_OBJC_LITERAL_CONVERSION'      => 'YES',
+        'CLANG_WARN_OBJC_ROOT_CLASS'              => 'YES_ERROR',
+        'CLANG_WARN_RANGE_LOOP_ANALYSIS'          => 'YES',
+        'CLANG_WARN_STRICT_PROTOTYPES'            => 'YES',
         'CLANG_WARN_SUSPICIOUS_MOVE'              => 'YES',
-        'GCC_C_LANGUAGE_STANDARD'                 => 'gnu99',
+        'CLANG_WARN_UNGUARDED_AVAILABILITY'       => 'YES_AGGRESSIVE',
+        'CLANG_WARN_UNREACHABLE_CODE'             => 'YES',
+        'COPY_PHASE_STRIP'                        => 'NO',
+        'ENABLE_STRICT_OBJC_MSGSEND'              => 'YES',
+        'GCC_C_LANGUAGE_STANDARD'                 => 'gnu11',
+        'GCC_NO_COMMON_BLOCKS'                    => 'YES',
         'GCC_WARN_64_TO_32_BIT_CONVERSION'        => 'YES',
-        'GCC_WARN_ABOUT_RETURN_TYPE'              => 'YES',
+        'GCC_WARN_ABOUT_RETURN_TYPE'              => 'YES_ERROR',
         'GCC_WARN_UNDECLARED_SELECTOR'            => 'YES',
-        'GCC_WARN_UNINITIALIZED_AUTOS'            => 'YES',
+        'GCC_WARN_UNINITIALIZED_AUTOS'            => 'YES_AGGRESSIVE',
         'GCC_WARN_UNUSED_FUNCTION'                => 'YES',
         'GCC_WARN_UNUSED_VARIABLE'                => 'YES',
+        'PRODUCT_NAME'                            => '$(TARGET_NAME)',
       },
       :release => {
-        'COPY_PHASE_STRIP'                   => 'YES',
+        'DEBUG_INFORMATION_FORMAT'           => 'dwarf-with-dsym',
         'ENABLE_NS_ASSERTIONS'               => 'NO',
-        'VALIDATE_PRODUCT'                   => 'YES',
+        'MTL_ENABLE_DEBUG_INFO'              => 'NO',
       }.freeze,
       :debug => {
-        'COPY_PHASE_STRIP'                   => 'NO',
+        'DEBUG_INFORMATION_FORMAT'           => 'dwarf',
         'ENABLE_TESTABILITY'                 => 'YES',
         'GCC_DYNAMIC_NO_PIC'                 => 'NO',
         'GCC_OPTIMIZATION_LEVEL'             => '0',
         'GCC_PREPROCESSOR_DEFINITIONS'       => ['DEBUG=1', '$(inherited)'],
-        'GCC_SYMBOLS_PRIVATE_EXTERN'         => 'NO',
+        'MTL_ENABLE_DEBUG_INFO'              => 'YES',
         'ONLY_ACTIVE_ARCH'                   => 'YES',
       }.freeze,
     }.freeze

data/lib/xcodeproj/gem_version.rb

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

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

@@ -77,15 +77,20 @@ module Xcodeproj
         # @param [String] key
         #        the key of the build setting.
         #
+        # @param [PBXNativeTarget] root_target
+        #        use this to resolve complete recursion between project and targets
+        #
         # @return [String] The value of the build setting
         #
-        def resolve_build_setting(key)
+        def resolve_build_setting(key, root_target = nil)
           setting = build_settings[key]
+          setting = resolve_variable_substitution(setting, root_target) if setting.is_a?(String)
           config_setting = base_configuration_reference && config[key]
+          config_setting = resolve_variable_substitution(config_setting, root_target) if config_setting.is_a?(String)
 
           project_setting = project.build_configuration_list[name]
           project_setting = nil if project_setting == self
-          project_setting &&= project_setting.resolve_build_setting(key)
+          project_setting &&= project_setting.resolve_build_setting(key, root_target)
 
           [project_setting, config_setting, setting].compact.reduce do |inherited, value|
             expand_build_setting(value, inherited)
@@ -96,6 +101,16 @@ module Xcodeproj
 
         private
 
+        CAPTURE_VARIABLE_IN_BUILD_CONFIG = /
+            \$ # matches dollar sign literally
+            [{(] # matches a single caracter on this list
+              ( # capture block
+              [^inherited] # ignore if match characters in this list
+              [$(){}_a-zA-Z0-9]*? # non-greedy lookup for everything that contains this list
+              )
+            [})] # matches a single caracter on this list
+          /x
+
         def expand_build_setting(build_setting_value, config_value)
           default = build_setting_value.is_a?(String) ? '' : []
           inherited = config_value || default
@@ -103,6 +118,25 @@ module Xcodeproj
           build_setting_value.map { |value| Constants::INHERITED_KEYWORDS.include?(value) ? inherited : value }.flatten
         end
 
+        def resolve_variable_substitution(config_setting, root_target)
+          variable = match_variable(config_setting)
+          if variable.nil?
+            return name if config_setting.eql?('CONFIGURATION')
+            if root_target
+              return root_target.build_configuration_list[name].resolve_build_setting(config_setting, root_target) || config_setting
+            else
+              return resolve_build_setting(config_setting, root_target) || config_setting
+            end
+          end
+          resolve_variable_substitution(config_setting.sub(CAPTURE_VARIABLE_IN_BUILD_CONFIG, resolve_variable_substitution(variable, root_target)), root_target)
+        end
+
+        def match_variable(config_setting)
+          match_data = config_setting.match(CAPTURE_VARIABLE_IN_BUILD_CONFIG)
+          return match_data.captures.first unless match_data.nil?
+          match_data
+        end
+
         def sorted_build_settings
           sorted = {}
           build_settings.keys.sort.each do |key|

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

@@ -66,13 +66,16 @@ module Xcodeproj
         #        wether the retrieved setting should take in consideration any
         #        configuration file present.
         #
+        # @param [PBXNativeTarget] root_target
+        #        use this to resolve complete recursion between project and targets
+        #
         # @return [Hash{String => String}] The value of the build setting
         #         grouped by the name of the build configuration.
         #
-        def get_setting(key, resolve_against_xcconfig = false)
+        def get_setting(key, resolve_against_xcconfig = false, root_target = nil)
           result = {}
           build_configurations.each do |bc|
-            result[bc.name] = resolve_against_xcconfig ? bc.resolve_build_setting(key) : bc.build_settings[key]
+            result[bc.name] = resolve_against_xcconfig ? bc.resolve_build_setting(key, root_target) : bc.build_settings[key]
           end
           result
         end

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

@@ -52,7 +52,7 @@ module Xcodeproj
         #         the default values for the platform.
         #
         def resolved_build_setting(key, resolve_against_xcconfig = false)
-          target_settings = build_configuration_list.get_setting(key, resolve_against_xcconfig)
+          target_settings = build_configuration_list.get_setting(key, resolve_against_xcconfig, self)
           project_settings = project.build_configuration_list.get_setting(key, resolve_against_xcconfig)
           target_settings.merge(project_settings) do |_key, target_val, proj_val|
             target_includes_inherited = Constants::INHERITED_KEYWORDS.any? { |keyword| target_val.include?(keyword) } if target_val

data/lib/xcodeproj/project/project_helper.rb

@@ -95,18 +95,16 @@ module Xcodeproj
         target.product_name = name
         target.product_type = Constants::PRODUCT_TYPE_UTI[:bundle]
 
-        build_settings = common_build_settings(nil, platform, nil, target.product_type)
-
         # Configuration List
         cl = project.new(XCConfigurationList)
         cl.default_configuration_is_visible = '0'
         cl.default_configuration_name = 'Release'
         release_conf = project.new(XCBuildConfiguration)
         release_conf.name = 'Release'
-        release_conf.build_settings = build_settings
+        release_conf.build_settings = common_build_settings(nil, platform, nil, target.product_type)
         debug_conf = project.new(XCBuildConfiguration)
         debug_conf.name = 'Debug'
-        debug_conf.build_settings = build_settings
+        debug_conf.build_settings = common_build_settings(nil, platform, nil, target.product_type)
         cl.build_configurations << release_conf
         cl.build_configurations << debug_conf
         target.build_configuration_list = cl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList