Merge pull request #474 from louisdh/common_build_settings_8.3

[Fixtures] Updated CommonBuildSettings with Xcode 8.3
CocoaPods · Mar 29, 2017 · 29c1afd · 29c1afd
2 parents 284d9d4 + fe3b98c
commit 29c1afd
Show file tree

Hide file tree

Showing 37 changed files with 1,365 additions and 1,389 deletions.
diff --git a/lib/xcodeproj/constants.rb b/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.2'
+    LAST_KNOWN_IOS_SDK = '10.3'
 
     # @return [String] The last known OS X SDK (stable).
     #
     LAST_KNOWN_OSX_SDK = '10.12'
 
     # @return [String] The last known tvOS SDK (stable).
-    LAST_KNOWN_TVOS_SDK = '10.1'
+    LAST_KNOWN_TVOS_SDK = '10.2'
 
     # @return [String] The last known watchOS SDK (stable).
-    LAST_KNOWN_WATCHOS_SDK = '3.1'
+    LAST_KNOWN_WATCHOS_SDK = '3.2'
 
     # @return [String] The last known archive version to Xcodeproj.
     #
@@ -33,7 +33,7 @@ module Constants
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_SWIFT_UPGRADE_CHECK = '0821'
+    LAST_SWIFT_UPGRADE_CHECK = '0830'
 
     # @return [String] The version of `.xcscheme` files supported by Xcodeproj
     #
@@ -273,6 +273,7 @@ module Constants
       [: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',
@@ -312,31 +313,32 @@ module Constants
     #
     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_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_SUSPICIOUS_MOVE'         => 'YES',
-        'GCC_C_LANGUAGE_STANDARD'            => 'gnu99',
-        'GCC_WARN_64_TO_32_BIT_CONVERSION'   => 'YES',
-        'GCC_WARN_ABOUT_RETURN_TYPE'         => 'YES',
-        'GCC_WARN_UNDECLARED_SELECTOR'       => 'YES',
-        'GCC_WARN_UNINITIALIZED_AUTOS'       => 'YES',
-        'GCC_WARN_UNUSED_FUNCTION'           => 'YES',
-        'GCC_WARN_UNUSED_VARIABLE'           => 'YES',
+        'ALWAYS_SEARCH_USER_PATHS'                => 'NO',
+        'CLANG_ANALYZER_NONNULL'                  => 'YES',
+        'CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION' => '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_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_SUSPICIOUS_MOVE'              => 'YES',
+        'GCC_C_LANGUAGE_STANDARD'                 => 'gnu99',
+        'GCC_WARN_64_TO_32_BIT_CONVERSION'        => 'YES',
+        'GCC_WARN_ABOUT_RETURN_TYPE'              => 'YES',
+        'GCC_WARN_UNDECLARED_SELECTOR'            => 'YES',
+        'GCC_WARN_UNINITIALIZED_AUTOS'            => 'YES',
+        'GCC_WARN_UNUSED_FUNCTION'                => 'YES',
+        'GCC_WARN_UNUSED_VARIABLE'                => 'YES',
       },
       :release => {
         'COPY_PHASE_STRIP'                   => 'YES',

diff --git a/...monBuildSettings/Project/Objc_iOS_Native/Assets.xcassets/AppIcon.appiconset/Contents.json b/...monBuildSettings/Project/Objc_iOS_Native/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -29,6 +39,51 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/spec/fixtures/CommonBuildSettings/Project/Objc_iOS_Native/Info.plist b/spec/fixtures/CommonBuildSettings/Project/Objc_iOS_Native/Info.plist
@@ -44,5 +44,12 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
 </dict>
 </plist>
diff --git a/.../fixtures/CommonBuildSettings/Project/Objc_watchOS_Native Extension/InterfaceController.m b/.../fixtures/CommonBuildSettings/Project/Objc_watchOS_Native Extension/InterfaceController.m
@@ -1,7 +1,7 @@
 #import "InterfaceController.h"
 
 
-@interface InterfaceController()
+@interface InterfaceController ()
 
 @end
 

diff --git a/...xtures/CommonBuildSettings/Project/Objc_watchOS_Native Extension/NotificationController.m b/...xtures/CommonBuildSettings/Project/Objc_watchOS_Native Extension/NotificationController.m
@@ -1,7 +1,7 @@
 #import "NotificationController.h"
 
 
-@interface NotificationController()
+@interface NotificationController ()
 
 @end