Merge pull request #468 from louisdh/common_build_settings

[Fixtures] Updated CommonBuildSettings with Xcode 8.2.1

.rubocop_cocoapods.yml

@@ -14,6 +14,33 @@ Documentation:
 
 #- CocoaPods -----------------------------------------------------------------#
 
+BlockLength:
+  Enabled: false
+
+VariableNumber:
+  Enabled: false
+
+MultilineHashBraceLayout:
+  Enabled: false
+
+SpaceInLambdaLiteral:
+  Enabled: false
+
+EmptyCaseCondition:
+  Enabled: false
+
+MultilineIfModifier:
+  Enabled: false
+
+TernaryParentheses:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+EmptyMethod:
+  Enabled: false
+
 # We adopted raise instead of fail.
 SignalException:
   EnforcedStyle: only_raise

Gemfile

@@ -18,7 +18,7 @@ group :development do
   gem 'prettybacon'
   gem 'rake'
 
-  gem 'codeclimate-test-reporter', :require => nil
+  gem 'codeclimate-test-reporter', '~> 0.4.1', :require => nil
   gem 'simplecov'
   gem 'rubocop'
 end

Gemfile.lock

@@ -24,21 +24,20 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    CFPropertyList (2.3.4)
-    activesupport (4.2.7.1)
+    CFPropertyList (2.3.5)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ast (2.2.0)
+    ast (2.3.0)
     bacon (1.2.0)
-    codeclimate-test-reporter (0.4.1)
+    codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
-    colored2 (3.1.1)
+    colored2 (3.1.2)
     docile (1.1.5)
-    ffi (1.9.6)
-    i18n (0.7.0)
+    ffi (1.9.17)
+    i18n (0.8.1)
     kicker (3.0.0)
       listen (~> 1.3.0)
       notify (~> 0.5.2)
@@ -48,41 +47,41 @@ GEM
       rb-kqueue (>= 0.2)
     metaclass (0.0.4)
     minitest (5.10.1)
-    mocha (1.1.0)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
-    mocha-on-bacon (0.2.2)
+    mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
     multi_json (1.12.1)
     nanaimo (0.2.3)
     notify (0.5.2)
-    parser (2.3.0.6)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
     prettybacon (0.0.2)
       bacon (~> 1.2)
-    rainbow (2.1.0)
-    rake (10.3.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
+    rainbow (2.2.1)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
+    rb-kqueue (0.2.4)
       ffi (>= 0.5.0)
-    rubocop (0.38.0)
-      parser (>= 2.3.0.6, < 3.0)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
-    simplecov (0.9.1)
+    ruby-progressbar (1.8.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thread_safe (0.3.5)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    thread_safe (0.3.6)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.0.2)
+    unicode-display_width (1.1.3)
 
 PLATFORMS
   ruby
@@ -91,7 +90,7 @@ DEPENDENCIES
   activesupport (~> 4.2)
   bacon
   claide!
-  codeclimate-test-reporter
+  codeclimate-test-reporter (~> 0.4.1)
   json!
   kicker
   mocha
@@ -103,4 +102,4 @@ DEPENDENCIES
   xcodeproj!
 
 BUNDLED WITH
-   1.13.5
+   1.14.5

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.0'
+    LAST_KNOWN_IOS_SDK = '10.2'
 
     # @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.0'
+    LAST_KNOWN_TVOS_SDK = '10.1'
 
     # @return [String] The last known watchOS SDK (stable).
-    LAST_KNOWN_WATCHOS_SDK = '3.0'
+    LAST_KNOWN_WATCHOS_SDK = '3.1'
 
     # @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 = '0730'
+    LAST_SWIFT_UPGRADE_CHECK = '0821'
 
     # @return [String] The version of `.xcscheme` files supported by Xcodeproj
     #
@@ -192,11 +192,18 @@ module Constants
       [:debug, :ios] => {
         # Empty?
       }.freeze,
+      [:swift] => {
+        'SWIFT_VERSION'                       => '3.0',
+      }.freeze,
       [:debug, :application, :swift] => {
         'SWIFT_OPTIMIZATION_LEVEL'          => '-Onone',
       }.freeze,
       [:debug, :swift] => {
-        'SWIFT_OPTIMIZATION_LEVEL'          => '-Onone',
+        'SWIFT_OPTIMIZATION_LEVEL'            => '-Onone',
+        'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'DEBUG',
+      }.freeze,
+      [:release, :swift] => {
+        'SWIFT_OPTIMIZATION_LEVEL'          => '-Owholemodule',
       }.freeze,
       [:debug, :static_library, :swift] => {
       }.freeze,
@@ -215,6 +222,7 @@ module Constants
         'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks', '@loader_path/Frameworks'],
         'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => 'iPhone Developer',
         'TARGETED_DEVICE_FAMILY'            => '1,2',
+        'CODE_SIGN_IDENTITY'                => '',
       }.freeze,
       [:osx, :framework] => {
         'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/../Frameworks', '@loader_path/Frameworks'],
@@ -226,10 +234,12 @@ module Constants
         'APPLICATION_EXTENSION_API_ONLY'    => 'YES',
         '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'],
         'TARGETED_DEVICE_FAMILY'            => '3',
+        'CODE_SIGN_IDENTITY'                => '',
       }.freeze,
       [:framework, :swift] => {
         'DEFINES_MODULE'                    => 'YES',
@@ -263,7 +273,6 @@ 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',
@@ -274,15 +283,15 @@ module Constants
         '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,
+      [:watchos, :application, :swift] => {
+        'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'YES',
+      }.freeze,
       [:bundle] => {
         'PRODUCT_NAME'                      => '$(TARGET_NAME)',
         'WRAPPER_EXTENSION'                 => 'bundle',
@@ -318,6 +327,9 @@ module Constants
         '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',

spec/fixtures/CommonBuildSettings/Project/OSX_Bundle/Info.plist

@@ -16,8 +16,6 @@
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSPrincipalClass</key>

spec/fixtures/CommonBuildSettings/Project/Objc_OSX_Framework/Info.plist

@@ -16,8 +16,6 @@
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

spec/fixtures/CommonBuildSettings/Project/Objc_OSX_Native/AppDelegate.m

@@ -10,8 +10,10 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     // Insert code here to initialize your application
 }
 
+
 - (void)applicationWillTerminate:(NSNotification *)aNotification {
     // Insert code here to tear down your application
 }
 
+
 @end

spec/fixtures/CommonBuildSettings/Project/Objc_OSX_Native/Base.lproj/Main.storyboard

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="6198" systemVersion="14A297b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6198"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -97,8 +97,7 @@
                                                 <action selector="saveDocumentAs:" target="Ady-hI-5gd" id="mDf-zr-I0C"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Revert to Saved" id="KaW-ft-85H">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        <menuItem title="Revert to Saved" keyEquivalent="r" id="KaW-ft-85H">
                                             <connections>
                                                 <action selector="revertDocumentToSaved:" target="Ady-hI-5gd" id="iJ3-Pv-kwq"/>
                                             </connections>
@@ -595,6 +594,19 @@
                                                 <action selector="runToolbarCustomizationPalette:" target="Ady-hI-5gd" id="pQI-g3-MTW"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="hB3-LF-h0Y"/>
+                                        <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="toggleSourceList:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="toggleFullScreen:" target="Ady-hI-5gd" id="dU3-MA-1Rq"/>
+                                            </connections>
+                                        </menuItem>
                                     </items>
                                 </menu>
                             </menuItem>
@@ -646,7 +658,7 @@
             </objects>
             <point key="canvasLocation" x="75" y="0.0"/>
         </scene>
-        <!--Window Controller - Window-->
+        <!--Window Controller-->
         <scene sceneID="R2V-B0-nI4">
             <objects>
                 <windowController id="B8D-0N-5wS" sceneMemberID="viewController">

spec/fixtures/CommonBuildSettings/Project/Objc_OSX_Native/Info.plist

@@ -18,8 +18,6 @@
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>

spec/fixtures/CommonBuildSettings/Project/Objc_OSX_Native/ViewController.m

@@ -8,10 +8,12 @@ - (void)viewDidLoad {
     // Do any additional setup after loading the view.
 }
 
+
 - (void)setRepresentedObject:(id)representedObject {
     [super setRepresentedObject:representedObject];
 
     // Update the view, if already loaded.
 }
 
+
 @end

spec/fixtures/CommonBuildSettings/Project/Objc_iOS_Framework/Info.plist

@@ -16,8 +16,6 @@
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

spec/fixtures/CommonBuildSettings/Project/Objc_iOS_Native/AppDelegate.m

@@ -17,28 +17,34 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     return YES;
 }
 
+
 - (void)applicationWillResignActive:(UIApplication *)application {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
 }
 
+
 - (void)applicationDidEnterBackground:(UIApplication *)application {
     // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
     // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 }
 
+
 - (void)applicationWillEnterForeground:(UIApplication *)application {
-    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+    // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
 }
 
+
 - (void)applicationDidBecomeActive:(UIApplication *)application {
     // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 }
 
+
 - (void)applicationWillTerminate:(UIApplication *)application {
     // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 }
 
+
 #pragma mark - Split view
 
 - (BOOL)splitViewController:(UISplitViewController *)splitViewController collapseSecondaryViewController:(UIViewController *)secondaryViewController ontoPrimaryViewController:(UIViewController *)primaryViewController {