Skip to content

Commit 56198ef

Browse files
committed
update RushingCells to Swift 3
1 parent 6d1a5e3 commit 56198ef

File tree

9 files changed

+95
-73
lines changed

9 files changed

+95
-73
lines changed

Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "roddi/FURRExtensions" "0.3.1"
2-
github "roddi/FURRDiff" "0.4.0"
1+
github "roddi/FURRExtensions" "0.3.2"
2+
github "roddi/FURRDiff" "0.4.2"
33
#git "file:///Users/roddi/GitDev/FURRExtensions" "master"
44
#git "file:///Users/roddi/GitDev/FURRDiff" "master"

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "roddi/FURRDiff" "0.4.0"
2-
github "roddi/FURRExtensions" "0.3.1"
1+
github "roddi/FURRDiff" "0.4.2"
2+
github "roddi/FURRExtensions" "0.3.2"

FURRDataSource.xcodeproj/project.pbxproj

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
isa = PBXProject;
210210
attributes = {
211211
LastSwiftUpdateCheck = 0700;
212-
LastUpgradeCheck = 0810;
212+
LastUpgradeCheck = 0900;
213213
ORGANIZATIONNAME = "Ruotger Deecke";
214214
TargetAttributes = {
215215
5698BA3B1B8DD0CB008805E2 = {
@@ -384,13 +384,21 @@
384384
CLANG_CXX_LIBRARY = "libc++";
385385
CLANG_ENABLE_MODULES = YES;
386386
CLANG_ENABLE_OBJC_ARC = YES;
387+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
387388
CLANG_WARN_BOOL_CONVERSION = YES;
389+
CLANG_WARN_COMMA = YES;
388390
CLANG_WARN_CONSTANT_CONVERSION = YES;
389391
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
390392
CLANG_WARN_EMPTY_BODY = YES;
391393
CLANG_WARN_ENUM_CONVERSION = YES;
394+
CLANG_WARN_INFINITE_RECURSION = YES;
392395
CLANG_WARN_INT_CONVERSION = YES;
396+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
397+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
393398
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
399+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
400+
CLANG_WARN_STRICT_PROTOTYPES = YES;
401+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
394402
CLANG_WARN_UNREACHABLE_CODE = YES;
395403
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
396404
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -436,13 +444,21 @@
436444
CLANG_CXX_LIBRARY = "libc++";
437445
CLANG_ENABLE_MODULES = YES;
438446
CLANG_ENABLE_OBJC_ARC = YES;
447+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
439448
CLANG_WARN_BOOL_CONVERSION = YES;
449+
CLANG_WARN_COMMA = YES;
440450
CLANG_WARN_CONSTANT_CONVERSION = YES;
441451
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
442452
CLANG_WARN_EMPTY_BODY = YES;
443453
CLANG_WARN_ENUM_CONVERSION = YES;
454+
CLANG_WARN_INFINITE_RECURSION = YES;
444455
CLANG_WARN_INT_CONVERSION = YES;
456+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
457+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
445458
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
459+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
460+
CLANG_WARN_STRICT_PROTOTYPES = YES;
461+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
446462
CLANG_WARN_UNREACHABLE_CODE = YES;
447463
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
448464
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -476,6 +492,7 @@
476492
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
477493
APPLICATION_EXTENSION_API_ONLY = YES;
478494
CLANG_ENABLE_MODULES = YES;
495+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
479496
DEFINES_MODULE = YES;
480497
DYLIB_COMPATIBILITY_VERSION = 1;
481498
DYLIB_CURRENT_VERSION = 1;
@@ -500,6 +517,7 @@
500517
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
501518
APPLICATION_EXTENSION_API_ONLY = YES;
502519
CLANG_ENABLE_MODULES = YES;
520+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
503521
DEFINES_MODULE = YES;
504522
DYLIB_COMPATIBILITY_VERSION = 1;
505523
DYLIB_CURRENT_VERSION = 1;

FURRDataSource.xcodeproj/xcshareddata/xcschemes/FURRDataSource.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

RushingCells/RushingCells.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@
496496
SDKROOT = iphoneos;
497497
SWIFT_INCLUDE_PATHS = ../Carthage;
498498
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
499-
SWIFT_VERSION = 2.3;
499+
SWIFT_VERSION = 3.0;
500500
TARGETED_DEVICE_FAMILY = "1,2";
501501
VALIDATE_PRODUCT = YES;
502502
};
@@ -543,7 +543,7 @@
543543
MTL_ENABLE_DEBUG_INFO = NO;
544544
SDKROOT = iphoneos;
545545
SWIFT_INCLUDE_PATHS = ../Carthage;
546-
SWIFT_VERSION = 2.3;
546+
SWIFT_VERSION = 3.0;
547547
TARGETED_DEVICE_FAMILY = "1,2";
548548
VALIDATE_PRODUCT = YES;
549549
};

RushingCells/RushingCells/AppDelegate.swift

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,36 +33,33 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
3333

3434
var window: UIWindow?
3535

36-
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
36+
func application(_: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]?) -> Bool {
3737
// Override point for customization after application launch.
3838
// swiftlint:disable force_cast
3939
let splitViewController = self.window!.rootViewController as! UISplitViewController
40-
let navigationController = splitViewController.viewControllers[splitViewController.viewControllers.count-1] as! UINavigationController
41-
// swiftlint:enable force_cast
42-
navigationController.topViewController!.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem()
4340
splitViewController.delegate = self
4441
return true
4542
}
4643

47-
func applicationWillResignActive(application: UIApplication) {
44+
func applicationWillResignActive(_: UIApplication) {
4845
// 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.
4946
// 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.
5047
}
5148

52-
func applicationDidEnterBackground(application: UIApplication) {
49+
func applicationDidEnterBackground(_: UIApplication) {
5350
// 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.
5451
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
5552
}
5653

57-
func applicationWillEnterForeground(application: UIApplication) {
54+
func applicationWillEnterForeground(_: UIApplication) {
5855
// 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.
5956
}
6057

61-
func applicationDidBecomeActive(application: UIApplication) {
58+
func applicationDidBecomeActive(_: UIApplication) {
6259
// 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.
6360
}
6461

65-
func applicationWillTerminate(application: UIApplication) {
62+
func applicationWillTerminate(_: UIApplication) {
6663
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
6764
}
6865

RushingCells/RushingCells/Base.lproj/LaunchScreen.storyboard

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13168.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13147.4"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
510
</dependencies>
611
<scenes>
712
<!--View Controller-->
@@ -13,10 +18,9 @@
1318
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
1419
</layoutGuides>
1520
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
16-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
21+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1722
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18-
<animations/>
19-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
23+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2024
</view>
2125
</viewController>
2226
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>

0 commit comments

Comments
 (0)