Merge pull request #252 from Lickability/migrate-swift-4.2

Upgrades project to Xcode 10 and Swift 4.2

Author: mliberatore

.swift-version

@@ -1 +1 @@
-4.1
+4.2

Example/PinpointKitExample.xcodeproj/project.pbxproj

@@ -125,7 +125,7 @@
 				TargetAttributes = {
 					DA19C3E31C67D4420016861F = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1000;
 					};
 				};
 			};
@@ -357,7 +357,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKitExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -371,7 +371,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKitExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

Example/PinpointKitExample/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         NSLog("Initial test log for the system logger.")
         return true
     }

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -689,7 +689,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -709,7 +709,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

PinpointKit/PinpointKit.xcodeproj/project.pbxproj

@@ -15,8 +15,8 @@ class AnnotationsView: UIView {
         moveViewIfAppropriate(view)
     }
 
-    override func bringSubview(toFront view: UIView) {
-        super.bringSubview(toFront: view)
+    override func bringSubviewToFront(_ view: UIView) {
+        super.bringSubviewToFront(view)
         moveViewIfAppropriate(view)
     }
 

PinpointKit/PinpointKit/Sources/Core/AnnotationsView.swift

@@ -53,7 +53,7 @@ open class BlurAnnotationView: AnnotationView, GLKViewDelegate {
         let maximumWidth = max(4.0, min(size.width, size.height) * 0.075)
         let outsideStrokeWidth = min(maximumWidth, 14.0) * 1.5
 
-        return UIEdgeInsetsInsetRect(annotationFrame, UIEdgeInsets(top: -outsideStrokeWidth, left: -outsideStrokeWidth, bottom: -outsideStrokeWidth, right: -outsideStrokeWidth))
+        return annotationFrame.inset(by: UIEdgeInsets(top: -outsideStrokeWidth, left: -outsideStrokeWidth, bottom: -outsideStrokeWidth, right: -outsideStrokeWidth))
     }
 
     // MARK: - Initializers
@@ -68,9 +68,7 @@ open class BlurAnnotationView: AnnotationView, GLKViewDelegate {
         if let EAGLContext = OpenGLES.EAGLContext(api: .openGLES2) {
             self.EAGLContext = EAGLContext
             GLKView = GLKit.GLKView(frame: bounds, context: EAGLContext)
-            CIContext = CoreImage.CIContext(eaglContext: EAGLContext, options: [
-                kCIContextUseSoftwareRenderer: false
-            ])
+            CIContext = CoreImage.CIContext(eaglContext: EAGLContext, options: [.useSoftwareRenderer: false])
         } else {
             EAGLContext = nil
             GLKView = nil

PinpointKit/PinpointKit/Sources/Core/BlurAnnotationView.swift

@@ -18,7 +18,7 @@ final class CheckmarkCell: UITableViewCell {
         }
     }
 
-    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
         imageView?.image = UIImage(named: "Checkmark", in: Bundle(for: type(of: self)), compatibleWith: nil)

PinpointKit/PinpointKit/Sources/Core/CheckmarkCell.swift

@@ -22,7 +22,7 @@ struct AnnotationViewFactory {
     let strokeColor: UIColor
 
     /// The text attributes of the annotation.
-    let textAttributes: [String: AnyObject]
+    let textAttributes: [NSAttributedString.Key: AnyObject]
 
     /**
      Constructs an annotation view.