xcodeproj 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bad4a5d9e130051e4ec9f5ba1123c0945646361aa179f50978277f886ac8ae26
-  data.tar.gz: 3dffd3ec7bd653c19005942c6e61e315819b62d29f96ab854ea4e9863b9e87d1
+  metadata.gz: b86a12e55bedc920b8bcf130a7d7db5d82748440f3690e751069b3b4c40a3d96
+  data.tar.gz: 0c00b4128824c115a6c60bc37a277b86817d9f4ee6d847fb5894d22d1876a713
 SHA512:
-  metadata.gz: ffb0fa8556611d4f0440490fe902e7dbfbbff9155edade6040bb0a5a6490536a01954c93f5784a6cf4da0e40852b1c06844718b2b6645407968b5ba697a47bc6
-  data.tar.gz: e1f4f116e2faab02c2dcd6031a7a37940fbc22cebfbe20a7c6a56628ce0cedf8b83184a3405bf83d3d2f4c390744197a0db8c57f1da5c11d3137a18f24764b01
+  metadata.gz: 6523c14761cd047e135b61689f4f3ee32a5d96b0cb3d773eec237e17267016398d1710ddd3c234c602b07791c914b9c478f1a760da56155697d2d5f49f76c869
+  data.tar.gz: fe540d756b206c5a9d21021dc061a30dce101d1ac13360ea70fab57596b777d5f08896bd807ad3fd89c9b5f8574572eb6600a1952cbddb3511089672d6096265

data/lib/xcodeproj/config.rb

@@ -10,7 +10,8 @@ module Xcodeproj
 
     KEY_VALUE_PATTERN = /
       (
-        [^=]+       # Any char, but not an assignment operator (non-greedy)
+        [^=\[]+     # Any char, but not an assignment operator
+                    # or subscript (non-greedy)
         (?:         # One or multiple conditional subscripts
           \[
           [^\]]*    # The subscript key
@@ -21,7 +22,7 @@ module Xcodeproj
           \]
         )*
       )
-      \s+           # Whitespaces after the key (needed because subscripts
+      \s*           # Whitespaces after the key (needed because subscripts
                     # always end with ']')
       =             # The assignment operator
       (.*)          # The value

data/lib/xcodeproj/constants.rb

@@ -4,17 +4,17 @@ module Xcodeproj
   module Constants
     # @return [String] The last known iOS SDK (stable).
     #
-    LAST_KNOWN_IOS_SDK = '10.3'
+    LAST_KNOWN_IOS_SDK = '11.3'
 
     # @return [String] The last known OS X SDK (stable).
     #
     LAST_KNOWN_OSX_SDK = '10.13'
 
     # @return [String] The last known tvOS SDK (stable).
-    LAST_KNOWN_TVOS_SDK = '10.2'
+    LAST_KNOWN_TVOS_SDK = '11.3'
 
     # @return [String] The last known watchOS SDK (stable).
-    LAST_KNOWN_WATCHOS_SDK = '3.2'
+    LAST_KNOWN_WATCHOS_SDK = '4.3'
 
     # @return [String] The last known archive version to Xcodeproj.
     #

data/lib/xcodeproj/gem_version.rb

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

data/lib/xcodeproj/project/object.rb

@@ -318,10 +318,10 @@ module Xcodeproj
           end
 
           unless object_plist.empty?
-            raise "[!] Xcodeproj doesn't know about the following " \
-                  "attributes #{object_plist.inspect} for the '#{isa}' isa." \
-                  "\nIf this attribute was generated by Xcode please file " \
-                  'an issue: https://github.com/CocoaPods/Xcodeproj/issues/new'
+            UI.warn "[!] Xcodeproj doesn't know about the following " \
+                    "attributes #{object_plist.inspect} for the '#{isa}' isa." \
+                    "\nIf this attribute was generated by Xcode please file " \
+                    'an issue: https://github.com/CocoaPods/Xcodeproj/issues/new'
           end
         end
 

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

@@ -154,42 +154,21 @@ module Xcodeproj
           sorted
         end
 
-        # yes, they are case-sensitive.
-        # no, Xcode doesn't do this for other PathList settings nor other
-        # settings ending in SEARCH_PATHS.
-        ARRAY_SETTINGS = %w(
-          ALTERNATE_PERMISSIONS_FILES
-          ARCHS
-          BUILD_VARIANTS
-          EXCLUDED_SOURCE_FILE_NAMES
-          FRAMEWORK_SEARCH_PATHS
-          GCC_PREPROCESSOR_DEFINITIONS
-          GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS
-          HEADER_SEARCH_PATHS
-          INFOPLIST_PREPROCESSOR_DEFINITIONS
-          LIBRARY_SEARCH_PATHS
-          OTHER_CFLAGS
-          OTHER_CPLUSPLUSFLAGS
-          OTHER_LDFLAGS
-          REZ_SEARCH_PATHS
-          SECTORDER_FLAGS
-          WARNING_CFLAGS
-          WARNING_LDFLAGS
-        ).freeze
-        private_constant :ARRAY_SETTINGS
-
         def normalize_array_settings(settings)
           return unless settings
+
+          array_settings = BuildSettingsArraySettingsByObjectVersion[project.object_version]
+
           settings.keys.each do |key|
             next unless value = settings[key]
             case value
             when String
-              next unless ARRAY_SETTINGS.include?(key)
+              next unless array_settings.include?(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?(key)
               settings[key] = value.join(' ')
             end
           end
@@ -211,3 +190,5 @@ module Xcodeproj
     end
   end
 end
+
+require 'xcodeproj/project/object/helpers/build_settings_array_settings_by_object_version'

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

@@ -105,7 +105,11 @@ module Xcodeproj
         #---------------------------------------------------------------------#
 
         def ascii_plist_annotation
-          " Build configuration list for #{target.isa} \"#{target}\" "
+          if target.nil?
+            ' Build configuration list for <deleted target> '
+          else
+            " Build configuration list for #{target.isa} \"#{target}\" "
+          end
         end
       end
     end

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

@@ -0,0 +1,70 @@
+module Xcodeproj
+  class Project
+    module Object
+      class XCBuildConfiguration
+        # yes, they are case-sensitive.
+        # no, Xcode doesn't do this for other PathList settings nor other
+        # settings ending in SEARCH_PATHS.
+        module BuildSettingsArraySettingsByObjectVersion
+          ARRAY_SETTINGS = %w(
+            ALTERNATE_PERMISSIONS_FILES
+            ARCHS
+            BUILD_VARIANTS
+            EXCLUDED_SOURCE_FILE_NAMES
+            FRAMEWORK_SEARCH_PATHS
+            GCC_PREPROCESSOR_DEFINITIONS
+            GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS
+            HEADER_SEARCH_PATHS
+            INFOPLIST_PREPROCESSOR_DEFINITIONS
+            LIBRARY_SEARCH_PATHS
+            OTHER_CFLAGS
+            OTHER_CPLUSPLUSFLAGS
+            OTHER_LDFLAGS
+            REZ_SEARCH_PATHS
+            SECTORDER_FLAGS
+            WARNING_CFLAGS
+            WARNING_LDFLAGS
+          ).to_set.freeze
+          private_constant :ARRAY_SETTINGS
+
+          ARRAY_SETTINGS_OBJECT_VERSION_50 = %w(
+            ALTERNATE_PERMISSIONS_FILES
+            ARCHS
+            BUILD_VARIANTS
+            EXCLUDED_SOURCE_FILE_NAMES
+            FRAMEWORK_SEARCH_PATHS
+            GCC_PREPROCESSOR_DEFINITIONS
+            GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS
+            HEADER_SEARCH_PATHS
+            INCLUDED_SOURCE_FILE_NAMES
+            INFOPLIST_PREPROCESSOR_DEFINITIONS
+            LD_RUNPATH_SEARCH_PATHS
+            LIBRARY_SEARCH_PATHS
+            LOCALIZED_STRING_MACRO_NAMES
+            OTHER_CFLAGS
+            OTHER_CPLUSPLUSFLAGS
+            OTHER_LDFLAGS
+            REZ_SEARCH_PATHS
+            SECTORDER_FLAGS
+            SYSTEM_FRAMEWORK_SEARCH_PATHS
+            SYSTEM_HEADER_SEARCH_PATHS
+            USER_HEADER_SEARCH_PATHS
+            WARNING_CFLAGS
+            WARNING_LDFLAGS
+          ).to_set.freeze
+          private_constant :ARRAY_SETTINGS_OBJECT_VERSION_50
+
+          def self.[](object_version)
+            object_version = object_version.to_i
+
+            if object_version >= 50
+              ARRAY_SETTINGS_OBJECT_VERSION_50
+            else
+              ARRAY_SETTINGS
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -181,6 +181,7 @@ module Xcodeproj
           else
             build_configuration = project.new(XCBuildConfiguration)
             build_configuration.name = name
+            product_type = self.product_type if respond_to?(:product_type)
             build_configuration.build_settings = ProjectHelper.common_build_settings(type, platform_name, deployment_target, product_type)
             build_configuration_list.build_configurations << build_configuration
             build_configuration

data/lib/xcodeproj/project/project_helper.rb

@@ -59,8 +59,10 @@ module Xcodeproj
         target.build_phases << project.new(PBXFrameworksBuildPhase)
 
         # Frameworks
-        framework_name = (platform == :osx) ? 'Cocoa' : 'Foundation'
-        target.add_system_framework(framework_name)
+        unless type == :static_library
+          framework_name = (platform == :osx) ? 'Cocoa' : 'Foundation'
+          target.add_system_framework(framework_name)
+        end
 
         target
       end

data/lib/xcodeproj/project/uuid_generator.rb

@@ -76,6 +76,7 @@ module Xcodeproj
       end
 
       def uuid_for_path(path)
+        require 'digest'
         Digest::MD5.hexdigest(path).upcase
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomos
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
 description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script
   boring management tasks or build Xcode-friendly libraries. Also includes support
   for Xcode workspaces (.xcworkspace) and configuration files (.xcconfig).
@@ -129,6 +129,7 @@ files:
 - lib/xcodeproj/project/object/container_item_proxy.rb
 - lib/xcodeproj/project/object/file_reference.rb
 - lib/xcodeproj/project/object/group.rb
+- lib/xcodeproj/project/object/helpers/build_settings_array_settings_by_object_version.rb
 - lib/xcodeproj/project/object/helpers/file_references_factory.rb
 - lib/xcodeproj/project/object/helpers/groupable_helper.rb
 - lib/xcodeproj/project/object/native_target.rb