Merge pull request philackm#48 from dhf/master

Swift 3 migration

Author: philackm

Classes/ScrollableGraphView.swift

@@ -115,10 +115,11 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				TargetAttributes = {
 					2918399D1C72E6A400753A45 = {
 						CreatedOnToolsVersion = 7.2.1;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -200,8 +201,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -244,8 +247,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -264,6 +269,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -279,6 +285,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ios.GraphView;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -293,6 +300,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ios.GraphView;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

graphview_example_code/GraphView.xcodeproj/project.pbxproj

@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
 
-    func applicationWillResignActive(application: UIApplication) {
+    func applicationWillResignActive(_ application: UIApplication) {
         // 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.
     }
 
-    func applicationDidEnterBackground(application: UIApplication) {
+    func applicationDidEnterBackground(_ application: UIApplication) {
         // 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.
     }
 
-    func applicationWillEnterForeground(application: UIApplication) {
+    func applicationWillEnterForeground(_ application: UIApplication) {
         // 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.
     }
 
-    func applicationDidBecomeActive(application: UIApplication) {
+    func applicationDidBecomeActive(_ application: UIApplication) {
         // 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.
     }
 
-    func applicationWillTerminate(application: UIApplication) {
+    func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 

graphview_example_code/GraphView/AppDelegate.swift

@@ -9,35 +9,35 @@ extension UIColor {
     // Convert a hex string to a UIColor object.
     class func colorFromHex(hexString:String) -> UIColor {
 
-        func cleanHexString(hexString: String) -> String {
+        func clean(hexString: String) -> String {
 
             var cleanedHexString = String()
 
             // Remove the leading "#"
             if(hexString[hexString.startIndex] == "#") {
-                cleanedHexString = hexString.substringFromIndex(hexString.startIndex.advancedBy(1))
+                cleanedHexString = hexString.substring(from: hexString.characters.index(hexString.startIndex, offsetBy: 1))
             }
 
             // TODO: Other cleanup. Allow for a "short" hex string, i.e., "#fff"
 
             return cleanedHexString
         }
 
-        let cleanedHexString = cleanHexString(hexString)
+        let cleanedHexString = clean(hexString: hexString)
 
         // If we can get a cached version of the colour, get out early.
-        if let cachedColor = UIColor.getColorFromCache(cleanedHexString) {
+        if let cachedColor = UIColor.getColorFromCache(hexString: cleanedHexString) {
             return cachedColor
         }
 
         // Else create the color, store it in the cache and return.
-        let scanner = NSScanner(string: cleanedHexString)
+        let scanner = Scanner(string: cleanedHexString)
 
         var value:UInt32 = 0
 
         // We have the hex value, grab the red, green, blue and alpha values.
         // Have to pass value by reference, scanner modifies this directly as the result of scanning the hex string. The return value is the success or fail.
-        if(scanner.scanHexInt(&value)){
+        if(scanner.scanHexInt32(&value)){
 
             // intValue = 01010101 11110111 11101010    // binary
             // intValue = 55       F7       EA          // hexadecimal
@@ -70,23 +70,23 @@ extension UIColor {
             // red, green, blue and alpha are currently between 0 and 255
             // We want to normalise these values between 0 and 1 to use with UIColor.
             let colors:[UInt32] = [red, green, blue]
-            let normalised = normaliseColors(colors)
+            let normalised = normalise(colors: colors)
 
             let newColor = UIColor(red: normalised[0], green: normalised[1], blue: normalised[2], alpha: 1)
-            UIColor.storeColorInCache(cleanedHexString, color: newColor)
+            UIColor.storeColorInCache(hexString: cleanedHexString, color: newColor)
 
             return newColor
 
         }
             // We couldn't get a value from a valid hex string.
         else {
             print("Error: Couldn't convert the hex string to a number, returning UIColor.whiteColor() instead.")
-            return UIColor.whiteColor()
+            return UIColor.white
         }
     }
 
     // Takes an array of colours in the range of 0-255 and returns a value between 0 and 1.
-    private class func normaliseColors(colors: [UInt32]) -> [CGFloat]{
+    private class func normalise(colors: [UInt32]) -> [CGFloat]{
         var normalisedVersions = [CGFloat]()
 
         for color in colors{