Support iOS 12 and Swift 4.2 #12

ethanhuang13 · Sep 21, 2018 · f428fc7 · f428fc7
1 parent 50b4dde
commit f428fc7
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+### Added
+- Support iOS 12 and Swift 4.2 #12
+
 ### Fixed
 - Universal Links plural
 - Link composer use form sheet for iPad #7

diff --git a/Knil.xcodeproj/project.pbxproj b/Knil.xcodeproj/project.pbxproj
@@ -625,19 +625,23 @@
 				TargetAttributes = {
 					6C0D218E20E0F2A600FBFA86 = {
 						CreatedOnToolsVersion = 9.4.1;
+						LastSwiftMigration = 1000;
 					};
 					6C0D21DC20E0F6B000FBFA86 = {
 						CreatedOnToolsVersion = 9.4.1;
+						LastSwiftMigration = 1000;
 					};
 					6C0D21E420E0F6B000FBFA86 = {
 						CreatedOnToolsVersion = 9.4.1;
 						TestTargetID = 6C0D218E20E0F2A600FBFA86;
 					};
 					6C0D21FF20E0F6B900FBFA86 = {
 						CreatedOnToolsVersion = 9.4.1;
+						LastSwiftMigration = 1000;
 					};
 					6C0D220720E0F6B900FBFA86 = {
 						CreatedOnToolsVersion = 9.4.1;
+						LastSwiftMigration = 1000;
 						TestTargetID = 6C0D218E20E0F2A600FBFA86;
 					};
 				};
@@ -971,7 +975,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.elaborapp.Knil;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -990,7 +994,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.elaborapp.Knil;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1017,7 +1021,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.elaborapp.KnilUIKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1046,7 +1050,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.elaborapp.KnilUIKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1115,7 +1119,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.elaborapp.KnilKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1144,7 +1148,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.elaborapp.KnilKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1165,7 +1169,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.elaborapp.KnilKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Knil.app/Knil";
 			};
@@ -1185,7 +1189,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.elaborapp.KnilKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Knil.app/Knil";
 			};

diff --git a/Knil/App/AppDelegate.swift b/Knil/App/AppDelegate.swift
@@ -19,7 +19,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return UIPasteboard.general.string
     }()
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
 
         UIView.appearance().tintColor = .tint
@@ -51,7 +51,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         if let pasteboardString = UIPasteboard.general.string,
             pasteboardString != currentPasteboardString {
-            NotificationCenter.default.post(name: .UIPasteboardChanged, object: nil)
+            NotificationCenter.default.post(name: UIPasteboard.changedNotification, object: nil)
             currentPasteboardString = pasteboardString
         }
     }

diff --git a/KnilUIKit/DetailViewController/DetailViewController.swift b/KnilUIKit/DetailViewController/DetailViewController.swift
@@ -46,7 +46,7 @@ class DetailViewController: UITableViewController {
             self.reloadData()
         })
 
-        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardDidChange), name: .UIPasteboardChanged, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardDidChange), name: UIPasteboard.changedNotification, object: nil)
 
         reloadData()
     }

diff --git a/KnilUIKit/ListViewController/ListViewController.swift b/KnilUIKit/ListViewController/ListViewController.swift
@@ -39,7 +39,7 @@ public class ListViewController: UITableViewController {
         navigationItem.title = "AASA".localized()
         navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(presentAddingAASAAlertController))
 
-        NotificationCenter.default.addObserver(self, selector: #selector(appWillResignActive), name: .UIApplicationWillResignActive, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(appWillResignActive), name: UIApplication.willResignActiveNotification, object: nil)
 
         reloadData()
     }

diff --git a/KnilUIKit/ViewModels/TableViewCellViewModel.swift b/KnilUIKit/ViewModels/TableViewCellViewModel.swift
@@ -16,19 +16,19 @@ public struct TableViewCellViewModel {
     let subtitle: String?
     let image: UIImage?
     let reuseIdentifier: String
-    let cellStyle: UITableViewCellStyle
-    let selectionStyle: UITableViewCellSelectionStyle
-    let accessoryType: UITableViewCellAccessoryType
+    let cellStyle: UITableViewCell.CellStyle
+    let selectionStyle: UITableViewCell.SelectionStyle
+    let accessoryType: UITableViewCell.AccessoryType
     let editActions: [UITableViewRowAction]
     var selectAction: Closure
     var detailAction: Closure
 
     public init(title: String,
                 subtitle: String? = nil,
                 image: UIImage? = nil,
-                cellStyle: UITableViewCellStyle = .default,
-                selectionStyle: UITableViewCellSelectionStyle = .default,
-                accessoryType: UITableViewCellAccessoryType = .disclosureIndicator,
+                cellStyle: UITableViewCell.CellStyle = .default,
+                selectionStyle: UITableViewCell.SelectionStyle = .default,
+                accessoryType: UITableViewCell.AccessoryType = .disclosureIndicator,
                 editActions: [UITableViewRowAction] = [],
                 selectAction: @escaping Closure = {},
                 detailAction: @escaping Closure = {}

diff --git a/KnilUIKit/ViewModels/TableViewViewModel.swift b/KnilUIKit/ViewModels/TableViewViewModel.swift
@@ -60,7 +60,7 @@ public class TableViewViewModel: NSObject, UITableViewDataSource, UITableViewDel
         cellViewModel.detailAction()
     }
 
-    public func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCellEditingStyle {
+    public func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCell.EditingStyle {
         return .none
     }