Upgrade to Swift 3

Author: mythz

src/TechStacks.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		25CAD1011BB8BEE5007800C2 /* TechStacks.dtos.extras.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25CAD1001BB8BEE5007800C2 /* TechStacks.dtos.extras.swift */; settings = {ASSET_TAGS = (); }; };
 		5162D4321A8234D7005AC7E2 /* TechnologiesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5162D4311A8234D7005AC7E2 /* TechnologiesViewController.swift */; };
 		5162D4341A82B82D005AC7E2 /* TechnologyDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5162D4331A82B82D005AC7E2 /* TechnologyDetailViewController.swift */; };
 		51A0817D1A7F6DB5000590E9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A0817C1A7F6DB5000590E9 /* AppDelegate.swift */; };
@@ -38,7 +37,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		25CAD1001BB8BEE5007800C2 /* TechStacks.dtos.extras.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TechStacks.dtos.extras.swift; sourceTree = "<group>"; };
 		5162D4311A8234D7005AC7E2 /* TechnologiesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TechnologiesViewController.swift; sourceTree = "<group>"; };
 		5162D4331A82B82D005AC7E2 /* TechnologyDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TechnologyDetailViewController.swift; sourceTree = "<group>"; };
 		51A081771A7F6DB5000590E9 /* TechStacks.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TechStacks.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -101,7 +99,6 @@
 				51A081871A7F6DB6000590E9 /* LaunchScreen.xib */,
 				51A081FB1A80455B000590E9 /* JsonServiceClient.swift */,
 				51A081F41A7F73FC000590E9 /* TechStacks.dtos.swift */,
-				25CAD1001BB8BEE5007800C2 /* TechStacks.dtos.extras.swift */,
 				51D0210A1A87875C007D973F /* Image.xcassets */,
 			);
 			path = TechStacks;
@@ -149,6 +146,7 @@
 					51A081761A7F6DB5000590E9 = {
 						CreatedOnToolsVersion = 6.1.1;
 						DevelopmentTeam = DK4VJ3YB24;
+						LastSwiftMigration = 0810;
 					};
 				};
 			};
@@ -193,7 +191,6 @@
 				51F0B9BB1A809803003910E7 /* UIExtensions.swift in Sources */,
 				51F0B9B91A8090E8003910E7 /* HeaderViewController.swift in Sources */,
 				51F0B9BD1A80A0D1003910E7 /* AppData.swift in Sources */,
-				25CAD1011BB8BEE5007800C2 /* TechStacks.dtos.extras.swift in Sources */,
 				51A0817D1A7F6DB5000590E9 /* AppDelegate.swift in Sources */,
 				5162D4341A82B82D005AC7E2 /* TechnologyDetailViewController.swift in Sources */,
 				51A0817F1A7F6DB5000590E9 /* HomeViewController.swift in Sources */,
@@ -319,6 +316,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.servicestack.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "c4b6145b-435c-41db-9a98-708a6d46f25d";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -331,6 +329,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.servicestack.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "c4b6145b-435c-41db-9a98-708a6d46f25d";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

src/TechStacks/AppData.swift

@@ -10,7 +10,7 @@ import UIKit
 import Foundation
 
 
-public class AppData : NSObject
+open class AppData : NSObject
 {
     var client = JsonServiceClient(baseUrl: "http://techstacks.io")
 
@@ -21,20 +21,20 @@ public class AppData : NSObject
         static let AllTechnologyStacks = "allTechnologyStacks"
     }
 
-    public dynamic var allTiers:[Option] = []
+    open dynamic var allTiers:[Option] = []
 
-    public dynamic var overview:AppOverviewResponse = AppOverviewResponse()
-    public dynamic var topTechnologies:[TechnologyInfo] = []
+    open dynamic var overview:AppOverviewResponse = AppOverviewResponse()
+    open dynamic var topTechnologies:[TechnologyInfo] = []
 
-    public dynamic var allTechnologies:[Technology] = []
-    public dynamic var allTechnologyStacks:[TechnologyStack] = []
+    open dynamic var allTechnologies:[Technology] = []
+    open dynamic var allTechnologyStacks:[TechnologyStack] = []
 
-    public dynamic var search:String?
-    public dynamic var filteredTechStacks:[TechnologyStack] = []
-    public dynamic var filteredTechnologies:[Technology] = []
+    open dynamic var search:String?
+    open dynamic var filteredTechStacks:[TechnologyStack] = []
+    open dynamic var filteredTechnologies:[Technology] = []
 
-    public var technologyStackCache:[String:GetTechnologyStackResponse] = [:]
-    public var technologyCache:[String:GetTechnologyResponse] = [:]
+    open var technologyStackCache:[String:GetTechnologyStackResponse] = [:]
+    open var technologyCache:[String:GetTechnologyResponse] = [:]
 
     override init(){
         super.init()
@@ -67,7 +67,7 @@ public class AppData : NSObject
             }
     }
 
-    func loadTechnologyStack(slug:String) -> Promise<GetTechnologyStackResponse> {
+    func loadTechnologyStack(_ slug:String) -> Promise<GetTechnologyStackResponse> {
         if let response = technologyStackCache[slug] {
             return Promise<GetTechnologyStackResponse> { (complete,reject) in complete(response) }
         }
@@ -81,17 +81,17 @@ public class AppData : NSObject
             }
     }
 
-    func searchTechStacks(query:String) -> Promise<FindTechStacksResponse> {
+    func searchTechStacks(_ query:String) -> Promise<QueryResponse<TechnologyStack>> {
         self.search = query
 
-        return client.getAsync(FindTechStacks(), query: ["NameContains":query, "DescriptionContains":query])
-            .then { r -> FindTechStacksResponse in
+        return client.getAsync(FindTechStacks<TechnologyStack>(), query: ["NameContains":query, "DescriptionContains":query])
+            .then { r -> QueryResponse<TechnologyStack> in
                 self.filteredTechStacks = r.results
                 return r
             }
     }
 
-    func loadTechnology(slug:String) -> Promise<GetTechnologyResponse> {
+    func loadTechnology(_ slug:String) -> Promise<GetTechnologyResponse> {
         if let response = technologyCache[slug] {
             return Promise<GetTechnologyResponse> { (complete,reject) in complete(response) }
         }
@@ -105,11 +105,11 @@ public class AppData : NSObject
             }
     }
 
-    func searchTechnologies(query:String) -> Promise<FindTechnologiesResponse> {
+    func searchTechnologies(_ query:String) -> Promise<QueryResponse<Technology>> {
         self.search = query
 
-        return client.getAsync(FindTechnologies(), query:["NameContains":query, "DescriptionContains":query])
-            .then { r -> FindTechnologiesResponse in
+        return client.getAsync(FindTechnologies<Technology>(), query:["NameContains":query, "DescriptionContains":query])
+            .then { r -> QueryResponse<Technology> in
                 self.filteredTechnologies = r.results
                 return r
             }
@@ -119,12 +119,12 @@ public class AppData : NSObject
     func loadDefaultImageCaches() {
         imageCache["stacks"] = UIImage(named: "stacks")
 
-        UIGraphicsBeginImageContextWithOptions(CGSizeMake(858, 689), false, 0.0)
+        UIGraphicsBeginImageContextWithOptions(CGSize(width: 858, height: 689), false, 0.0)
         imageCache["blankScreenshot"] = UIGraphicsGetImageFromCurrentImageContext()
         UIGraphicsEndImageContext()
     }
 
-    public func loadAllImagesAsync(urls:[String]) -> Promise<[String:UIImage?]> {
+    open func loadAllImagesAsync(_ urls:[String]) -> Promise<[String:UIImage?]> {
         var images = [String:UIImage?]()
         return Promise<[String:UIImage?]> { (complete, reject) in
             for url in urls {
@@ -139,13 +139,13 @@ public class AppData : NSObject
         }
     }
 
-    public func loadImageAsync(url:String) -> Promise<UIImage?> {
+    open func loadImageAsync(_ url:String) -> Promise<UIImage?> {
         if let image = imageCache[url] {
             return Promise<UIImage?> { (complete, reject) in complete(image) }
         }
 
         return client.getDataAsync(url)
-            .then { (data:NSData) -> UIImage? in
+            .then { (data:Data) -> UIImage? in
                 if let image = UIImage(data:data) {
                     self.imageCache[url] = image
                     return image
@@ -156,23 +156,23 @@ public class AppData : NSObject
 
     /* KVO Observable helpers */
     var observedProperties = [NSObject:[String]]()
-    var ctx:AnyObject = 1
+    var ctx:AnyObject = 1 as AnyObject
 
-    public func observe(observer: NSObject, properties:[String]) {
+    open func observe(_ observer: NSObject, properties:[String]) {
         for property in properties {
             self.observe(observer, property: property)
         }
     }
 
-    public func observe(observer: NSObject, property:String) {
-        self.addObserver(observer, forKeyPath: property, options: [.New , .Old], context: &ctx)
+    open func observe(_ observer: NSObject, property:String) {
+        self.addObserver(observer, forKeyPath: property, options: [.new , .old], context: &ctx)
 
         var properties = observedProperties[observer] ?? [String]()
         properties.append(property)
         observedProperties[observer] = properties
     }
 
-    public func unobserve(observer: NSObject) {
+    open func unobserve(_ observer: NSObject) {
         if let properties = observedProperties[observer] {
             for property in properties {
                 self.removeObserver(observer, forKeyPath: property, context: &ctx)

src/TechStacks/AppDelegate.swift

@@ -13,43 +13,43 @@ 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.
 
         //https://coderwall.com/p/dyqrfa/customize-navigation-bar-appearance-with-swift
         let navigationBarAppearace = UINavigationBar.appearance()
-        navigationBarAppearace.translucent = false
-        navigationBarAppearace.tintColor = UIColor.whiteColor()
+        navigationBarAppearace.isTranslucent = false
+        navigationBarAppearace.tintColor = UIColor.white
         navigationBarAppearace.barTintColor = UIColor(red: 0.0, green: 0.58431372550000005, blue: 0.96078431369999995, alpha: 1.0)
-        navigationBarAppearace.titleTextAttributes = [NSForegroundColorAttributeName:UIColor.whiteColor()]
-        UIApplication.sharedApplication().statusBarStyle = UIStatusBarStyle.LightContent
+        navigationBarAppearace.titleTextAttributes = [NSForegroundColorAttributeName:UIColor.white]
+        UIApplication.shared.statusBarStyle = UIStatusBarStyle.lightContent
 
         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:.
     }
 
-    func applicationDidReceiveMemoryWarning(application: UIApplication) {
+    func applicationDidReceiveMemoryWarning(_ application: UIApplication) {
         appData.resetCache()
     }
 

src/TechStacks/HomeViewController.swift

@@ -16,7 +16,7 @@ class HomeViewController: UIViewController, UITableViewDelegate, UITableViewData
     @IBOutlet weak var technologyPicker: UIPickerView!
     var selectedTechnology:TechnologyTier?
 
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
     }
 
     override func viewDidLoad() {
@@ -32,7 +32,7 @@ class HomeViewController: UIViewController, UITableViewDelegate, UITableViewData
         self.appData.loadOverview()
     }
 
-    override func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [String : AnyObject]?, context: UnsafeMutablePointer<Void>) {
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
         if let kp = keyPath {
             switch kp {
             case AppData.Property.AllTiers:
@@ -52,50 +52,50 @@ class HomeViewController: UIViewController, UITableViewDelegate, UITableViewData
     }
 
     /* PickerView */
-    func numberOfComponentsInPickerView(pickerView: UIPickerView) -> Int {
+    func numberOfComponents(in pickerView: UIPickerView) -> Int {
         return 1
     }
 
-    func pickerView(pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+    func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
         return appData.allTiers.count
     }
 
-    func pickerView(pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
+    func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
         return appData.allTiers[row].title
     }
 
-    func pickerView(pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+    func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
         self.selectedTechnology = appData.allTiers[row].value
         tblView.reloadData()
     }
 
     /* TableView */
-    func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return selectedTechnologies.count
     }
 
-    func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
 
         var cell: UITableViewCell
-        if let viewCell = self.tblView.dequeueReusableCellWithIdentifier("cellHome") as UITableViewCell? {
+        if let viewCell = self.tblView.dequeueReusableCell(withIdentifier: "cellHome") as UITableViewCell? {
             cell = viewCell
         } else {
             cell = UITableViewCell()
         }
 
-        cell.accessoryType = UITableViewCellAccessoryType.DisclosureIndicator
+        cell.accessoryType = UITableViewCellAccessoryType.disclosureIndicator
         let tech = selectedTechnologies[indexPath.row]
         cell.textLabel?.text = "\(tech.name!) (\(tech.stacksCount!))"
-        cell.textLabel!.font = cell.textLabel!.font.fontWithSize(Style.tableCellTitleSize)
+        cell.textLabel!.font = cell.textLabel!.font.withSize(Style.tableCellTitleSize)
 
         return cell
     }
 
-    func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return Style.tableCellHeight
     }
 
-    func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let selected = selectedTechnologies[indexPath.row]
         self.navigationController?.openTechnology(selected.slug!)
     }