Migration to Swift 4.2

Author: Tieme van Veen

.swift-version

@@ -1 +1 @@
-4.0
+4.2

ContextLabel.podspec

@@ -9,6 +9,7 @@ Pod::Spec.new do |s|
     s.source = { :git => 'https://github.com/michaelloistl/ContextLabel.git', :tag => s.version }
 
     s.ios.deployment_target = '8.0'
+    s.swift_version         = '4.2'
 
     s.source_files = 'Source/*.{swift}'
 

ContextLabel.xcodeproj/project.pbxproj

@@ -166,12 +166,13 @@
 					6A5EA95E1E7BC20900BCEF8C = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = 52EDKXLXY5;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 					6A5EA9721E7BC20900BCEF8C = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = 52EDKXLXY5;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 6A5EA95E1E7BC20900BCEF8C;
 					};
@@ -371,7 +372,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.aplo.ContextLabel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -384,7 +385,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.aplo.ContextLabel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -398,8 +399,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.aplo.ContextLabelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ContextLabel.app/ContextLabel";
 			};
 			name = Debug;
@@ -414,8 +414,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.aplo.ContextLabelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ContextLabel.app/ContextLabel";
 			};
 			name = Release;

ContextLabel/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 {
 
         window = UIWindow(frame: UIScreen.main.bounds)
         window!.rootViewController = UINavigationController(rootViewController: ViewController())

ContextLabel/TableViewCell.swift

@@ -45,13 +45,13 @@ class TableViewCell: UITableViewCell {
         _label.underlineStyle = { (linkResult) in
             switch linkResult.detectionType {
             case .userHandle, .hashtag:
-                return .styleDouble
+                return .double
             case .url:
-                return .styleSingle
+                return .single
             case .textLink:
-                return .styleSingle
+                return .single
             default:
-                return .styleNone
+                return []
             }
         }
 
@@ -63,7 +63,7 @@ class TableViewCell: UITableViewCell {
 
     // MARK: - Initializers
 
-    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
         contentView.addSubview(contextLabel)

Source/ContextLabel.swift

@@ -54,7 +54,7 @@ public struct TouchResult {
   public let linkResult: LinkResult?
   public let touches: Set<UITouch>
   public let event: UIEvent?
-  public let state: UIGestureRecognizerState
+  public let state: UIGestureRecognizer.State
 }
 
 public struct TextLink {
@@ -135,18 +135,18 @@ open class ContextLabel: UILabel, NSLayoutManagerDelegate, UIGestureRecognizerDe
   }
 
   public var underlineStyle: (LinkResult) -> NSUnderlineStyle = { _ in
-    return .styleNone
+    return []
   }
 
   public var modifiedAttributedString: ((NSAttributedString) -> NSAttributedString)?
 
   public var didTouch: (TouchResult) -> Void = { _ in }
 
-  public var didCopy: (String!) -> Void = { _ in }
+  public var didCopy: (String?) -> Void = { _ in }
 
   // MARK: - Properties
 
-  public var touchState: UIGestureRecognizerState = .possible
+  public var touchState: UIGestureRecognizer.State = .possible
 
   // LineSpacing
   public var lineSpacing: CGFloat?
@@ -463,7 +463,7 @@ open class ContextLabel: UILabel, NSLayoutManagerDelegate, UIGestureRecognizerDe
 
   // MARK: - Methods
 
-  func addAttributes(_ attributes: Dictionary<NSAttributedStringKey, Any>, range: NSRange) {
+  func addAttributes(_ attributes: Dictionary<NSAttributedString.Key, Any>, range: NSRange) {
     if let contextLabelData = contextLabelData {
       let mutableAttributedString = NSMutableAttributedString(attributedString: contextLabelData.attributedString)
       mutableAttributedString.addAttributes(attributes, range: range)
@@ -510,7 +510,7 @@ open class ContextLabel: UILabel, NSLayoutManagerDelegate, UIGestureRecognizerDe
     self.textLinks = textLinks
   }
 
-  open func attributesFromProperties() -> [NSAttributedStringKey : Any] {
+  open func attributesFromProperties() -> [NSAttributedString.Key : Any] {
 
     // Shadow attributes
     let shadow = NSShadow()
@@ -547,7 +547,7 @@ open class ContextLabel: UILabel, NSLayoutManagerDelegate, UIGestureRecognizerDe
     }
 
     // Attributes dictionary
-    var attributes: [NSAttributedStringKey : Any] = [
+    var attributes: [NSAttributedString.Key : Any] = [
       .shadow: shadow,
       .paragraphStyle: mutableParagraphStyle,
       .foregroundColor: color
@@ -560,14 +560,14 @@ open class ContextLabel: UILabel, NSLayoutManagerDelegate, UIGestureRecognizerDe
     return attributes
   }
 
-  fileprivate func attributesWithTextColor(_ textColor: UIColor) -> [NSAttributedStringKey : Any] {
+  fileprivate func attributesWithTextColor(_ textColor: UIColor) -> [NSAttributedString.Key : Any] {
     var attributes = attributesFromProperties()
     attributes[.foregroundColor] = textColor
 
     return attributes
   }
 
-  fileprivate func attributes(with font: UIFont?, textColor: UIColor, underlineStyle: NSUnderlineStyle) -> [NSAttributedStringKey: Any] {
+  fileprivate func attributes(with font: UIFont?, textColor: UIColor, underlineStyle: NSUnderlineStyle) -> [NSAttributedString.Key: Any] {
     var attributes = attributesWithTextColor(textColor)
     attributes[.underlineStyle] = underlineStyle.rawValue
     if let font = font {