xcodeproj 0.28.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eae456c17889ae1b3dc65acb3e95122776f584f5
-  data.tar.gz: 30e4ee588cfccff194ad57520a64737e2bf7434e
+  metadata.gz: 4661a83a53151976f7e363d73feda6f24df578e0
+  data.tar.gz: c9a08f7dca14cd343e14ab4bfbb0e2f46bbf89fd
 SHA512:
-  metadata.gz: e149c929d82e0593c8accbbdedd4bb6a23405b976aefcfb551d50381aada69b8b39725240ff4c34f99918c3aaa57c178cc939dae69537eb04516e1cb0ea5d3d9
-  data.tar.gz: 82e272ca562aae5487bd0ef985e411f1576a55b1e6056a3dd6b4434e88f5700632e236e06b98acad5d6af8acc8c292e3bca7d1c5a756a24a06bf79910e1934be
+  metadata.gz: 45849f18963cedccdb3d56284f9f7b9ae4eb671750dce2acb138b3760072afdd116b293953b0a476b521df35a24e074c56d52a0b942425a384619b0aefdea6b5
+  data.tar.gz: 0c32c169f15589f51712eec8ae8bf7f95f62781ba3e31eb20e38593768e89ed9d4ada6ecaec33d00be49b2224765710565af3517a509e21c385286a6f4eda850

data/lib/xcodeproj/command/config_dump.rb

@@ -19,11 +19,12 @@ module Xcodeproj
 
       self.arguments = [
         CLAide::Argument.new('PROJECT', false),
+        CLAide::Argument.new('OUTPUT', false),
       ]
 
       def initialize(argv)
         self.xcodeproj_path = argv.shift_argument
-        @output_path  = Pathname(argv.shift_argument || '.')
+        @output_path = Pathname(argv.shift_argument || '.')
 
         super
       end

data/lib/xcodeproj/config/other_linker_flags_parser.rb

@@ -8,7 +8,7 @@ module Xcodeproj
       # @return [Hash{Symbol, Array[String]}] Splits the given
       #         other linker flags value by type.
       #
-      # @param  [String] flags
+      # @param  [String, Array] flags
       #         The other linker flags value.
       #
       def self.parse(flags)
@@ -21,7 +21,10 @@ module Xcodeproj
         }
 
         key = nil
-        split(flags).each do |token|
+        if flags.is_a? String
+          flags = split(flags)
+        end
+        flags.each do |token|
           case token
           when '-framework'
             key = :frameworks

data/lib/xcodeproj/config.rb

@@ -82,7 +82,7 @@ module Xcodeproj
     def to_s(prefix = nil)
       include_lines = includes.map { |path| "#include \"#{normalized_xcconfig_path(path)}\"" }
       settings = to_hash(prefix).sort_by(&:first).map { |k, v| "#{k} = #{v}".strip }
-      [include_lines + settings].join("\n")
+      (include_lines + settings).join("\n") << "\n"
     end
 
     # Writes the serialized representation of the internal data to the given
@@ -275,9 +275,17 @@ module Xcodeproj
     #
     def merge_attributes!(attributes)
       @attributes.merge!(attributes) do |_, v1, v2|
-        v1, v2 = v1.strip, v2.strip
-        existing = v1.strip.shellsplit
-        existing.include?(v2) ? v1 : "#{v1} #{v2}"
+        v1 = v1.strip
+        v2 = v2.strip
+        v1_split = v1.shellsplit
+        v2_split = v2.shellsplit
+        if (v2_split - v1_split).empty? || v1_split.first(v2_split.size) == v2_split
+          v1
+        elsif v2_split.first(v1_split.size) == v1_split
+          v2
+        else
+          "#{v1} #{v2}"
+        end
       end
     end
 
@@ -317,7 +325,8 @@ module Xcodeproj
     def extract_key_value(line)
       match = line.match(KEY_VALUE_PATTERN)
       if match
-        key, value = match[1], match[2]
+        key = match[1]
+        value = match[2]
         [key.strip, value.strip]
       else
         []

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 = '9.0'
+    LAST_KNOWN_IOS_SDK = '9.3'
 
     # @return [String] The last known OS X SDK (stable).
     #
-    LAST_KNOWN_OSX_SDK  = '10.11'
+    LAST_KNOWN_OSX_SDK = '10.11'
 
-    # @return [String] The last known tvOS SDK (unstable).
-    LAST_KNOWN_TVOS_SDK = '9.0'
+    # @return [String] The last known tvOS SDK (stable).
+    LAST_KNOWN_TVOS_SDK = '9.2'
 
-    # @return [String] The last known watchOS SDK.
-    LAST_KNOWN_WATCHOS_SDK = '2.0'
+    # @return [String] The last known watchOS SDK (stable).
+    LAST_KNOWN_WATCHOS_SDK = '2.2'
 
     # @return [String] The last known archive version to Xcodeproj.
     #
@@ -25,15 +25,15 @@ module Xcodeproj
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_KNOWN_OBJECT_VERSION  = 47
+    LAST_KNOWN_OBJECT_VERSION = 47
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_UPGRADE_CHECK  = '0700'
+    LAST_UPGRADE_CHECK = '0700'
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_SWIFT_UPGRADE_CHECK = '0700'
+    LAST_SWIFT_UPGRADE_CHECK = '0730'
 
     # @return [String] The version of `.xcscheme` files supported by Xcodeproj
     #
@@ -113,12 +113,14 @@ module Xcodeproj
       :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',
       :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',
     }.freeze
 
     # @return [Hash] The extensions or the various product UTIs.
@@ -138,13 +140,16 @@ module Xcodeproj
     #
     COMMON_BUILD_SETTINGS = {
       :all => {
-        'PRODUCT_NAME'                      => '$(TARGET_NAME)',
         'ENABLE_STRICT_OBJC_MSGSEND'        => 'YES',
+        'GCC_NO_COMMON_BLOCKS'              => 'YES',
+        'PRODUCT_NAME'                      => '$(TARGET_NAME)',
       }.freeze,
       [:debug] => {
+        'DEBUG_INFORMATION_FORMAT'          => 'dwarf',
         'MTL_ENABLE_DEBUG_INFO'             => 'YES',
       }.freeze,
       [:release] => {
+        'DEBUG_INFORMATION_FORMAT'          => 'dwarf-with-dsym',
         'MTL_ENABLE_DEBUG_INFO'             => 'NO',
       }.freeze,
       [:ios] => {
@@ -163,23 +168,18 @@ module Xcodeproj
         # Empty?
       }.freeze,
       [:release, :osx] => {
-        'DEBUG_INFORMATION_FORMAT'          => 'dwarf-with-dsym',
+        # Empty?
       }.freeze,
       [:debug, :ios] => {
         # Empty?
       }.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',
+      [:debug, :swift] => {
+        'SWIFT_OPTIMIZATION_LEVEL'          => '-Onone',
       }.freeze,
       [:debug, :static_library, :swift] => {
-        'ENABLE_TESTABILITY'                => 'YES',
       }.freeze,
       [:framework] => {
         'VERSION_INFO_PREFIX'               => '',
@@ -200,25 +200,43 @@ module Xcodeproj
       [:osx, :framework] => {
         'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/../Frameworks', '@loader_path/Frameworks'],
         'FRAMEWORK_VERSION'                 => 'A',
+        'CODE_SIGN_IDENTITY'                => '-',
         'COMBINE_HIDPI_IMAGES'              => 'YES',
       }.freeze,
+      [:watchos, :framework] => {
+        'APPLICATION_EXTENSION_API_ONLY'    => 'YES',
+        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks', '@loader_path/Frameworks'],
+        'TARGETED_DEVICE_FAMILY'            => '4',
+      }.freeze,
+      [:tvos, :framework] => {
+        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks', '@loader_path/Frameworks'],
+        'TARGETED_DEVICE_FAMILY'            => '3',
+      }.freeze,
       [:framework, :swift] => {
         'DEFINES_MODULE'                    => 'YES',
       }.freeze,
-      [:debug, :framework, :swift] => {
-        'SWIFT_OPTIMIZATION_LEVEL'          => '-Onone',
-      }.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',
+      }.freeze,
+      [:watchos, :static_library] => {
+        'OTHER_LDFLAGS'                     => '-ObjC',
+        'SKIP_INSTALL'                      => 'YES',
+      }.freeze,
+      [:tvos, :static_library] => {
         'OTHER_LDFLAGS'                     => '-ObjC',
         'SKIP_INSTALL'                      => 'YES',
       }.freeze,
       [:osx, :dynamic_library] => {
-        'EXECUTABLE_PREFIX'                 => 'lib',
+        'CODE_SIGN_IDENTITY'                => '-',
         'DYLIB_COMPATIBILITY_VERSION'       => '1',
         'DYLIB_CURRENT_VERSION'             => '1',
+        'EXECUTABLE_PREFIX'                 => 'lib',
       }.freeze,
       [:application] => {
         'ASSETCATALOG_COMPILER_APPICON_NAME' => 'AppIcon',
@@ -226,12 +244,26 @@ module Xcodeproj
       [:ios, :application] => {
         'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => 'iPhone Developer',
         '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'],
       }.freeze,
+      [:watchos, :application] => {
+        'SKIP_INSTALL'                      => 'YES',
+        'TARGETED_DEVICE_FAMILY'            => '4',
+      }.freeze,
+      [:watchos, :application, :swift] => {
+        'EMBEDDED_CONTENT_CONTAINS_SWIFT'   => 'YES',
+      }.freeze,
+      [:tvos, :application] => {
+        'ASSETCATALOG_COMPILER_APPICON_NAME' => 'App Icon & Top Shelf Image',
+        'ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME' => 'LaunchImage',
+        'TARGETED_DEVICE_FAMILY'            => '3',
+        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks'],
+      }.freeze,
       [:bundle] => {
         'PRODUCT_NAME'                      => '$(TARGET_NAME)',
         'WRAPPER_EXTENSION'                 => 'bundle',
@@ -241,9 +273,10 @@ module Xcodeproj
         'SDKROOT'                           => 'iphoneos',
       }.freeze,
       [:osx, :bundle] => {
+        'CODE_SIGN_IDENTITY'                => '-',
         'COMBINE_HIDPI_IMAGES'              => 'YES',
-        'SDKROOT'                           => 'macosx',
         'INSTALL_PATH'                      => '$(LOCAL_LIBRARY_DIR)/Bundles',
+        'SDKROOT'                           => 'macosx',
       }.freeze,
     }.freeze
 
@@ -252,19 +285,20 @@ module Xcodeproj
     PROJECT_DEFAULT_BUILD_SETTINGS = {
       :all => {
         'ALWAYS_SEARCH_USER_PATHS'           => 'NO',
+        'CLANG_ANALYZER_NONNULL'             => 'YES',
         'CLANG_CXX_LANGUAGE_STANDARD'        => 'gnu++0x',
         'CLANG_CXX_LIBRARY'                  => 'libc++',
+        'CLANG_ENABLE_MODULES'               => 'YES',
         'CLANG_ENABLE_OBJC_ARC'              => 'YES',
+        'CLANG_WARN__DUPLICATE_METHOD_MATCH' => 'YES',
         'CLANG_WARN_BOOL_CONVERSION'         => 'YES',
         'CLANG_WARN_CONSTANT_CONVERSION'     => 'YES',
         'CLANG_WARN_DIRECT_OBJC_ISA_USAGE'   => 'YES',
-        'CLANG_WARN__DUPLICATE_METHOD_MATCH' => '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_ENABLE_MODULES'               => 'YES',
         'GCC_C_LANGUAGE_STANDARD'            => 'gnu99',
         'GCC_WARN_64_TO_32_BIT_CONVERSION'   => 'YES',
         'GCC_WARN_ABOUT_RETURN_TYPE'         => 'YES',
@@ -279,12 +313,13 @@ module Xcodeproj
         'VALIDATE_PRODUCT'                   => 'YES',
       }.freeze,
       :debug => {
-        'ONLY_ACTIVE_ARCH'                   => 'YES',
         'COPY_PHASE_STRIP'                   => 'NO',
+        'ENABLE_TESTABILITY'                 => 'YES',
         'GCC_DYNAMIC_NO_PIC'                 => 'NO',
         'GCC_OPTIMIZATION_LEVEL'             => '0',
         'GCC_PREPROCESSOR_DEFINITIONS'       => ['DEBUG=1', '$(inherited)'],
         'GCC_SYMBOLS_PRIVATE_EXTERN'         => 'NO',
+        'ONLY_ACTIVE_ARCH'                   => 'YES',
       }.freeze,
     }.freeze
 
@@ -313,6 +348,6 @@ module Xcodeproj
 
     # @return [Array] The extensions which are associated with header files.
     #
-    HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp .tpp).freeze
+    HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp .tpp .hxx .def).freeze
   end
 end

data/lib/xcodeproj/differ.rb

@@ -43,19 +43,19 @@ module Xcodeproj
     # @return [Nil] if the given values are equal.
     #
     def self.diff(value_1, value_2, options = {})
-      options[:key_1]  ||= 'value_1'
-      options[:key_2]  ||= 'value_2'
+      options[:key_1] ||= 'value_1'
+      options[:key_2] ||= 'value_2'
       options[:id_key] ||= nil
 
-      if value_1.class == value_2.class
-        method = case value_1
+      method = if value_1.class == value_2.class
+                 case value_1
                  when Hash  then :hash_diff
                  when Array then :array_diff
                  else :generic_diff
                  end
-      else
-        method = :generic_diff
-      end
+               else
+                 :generic_diff
+               end
       send(method, value_1, value_2, options)
     end
 

data/lib/xcodeproj/gem_version.rb

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