Support Swift4.2

natmark · Nov 30, 2018 · 6b67ed5 · 6b67ed5
1 parent 9939802
commit 6b67ed5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0.2
+4.2.1
diff --git a/ProcessingKit.xcodeproj/project.pbxproj b/ProcessingKit.xcodeproj/project.pbxproj
@@ -909,7 +909,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -931,7 +931,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -945,7 +945,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.natmark.ProcessingKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -959,7 +959,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.natmark.ProcessingKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -984,7 +984,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1008,7 +1008,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1042,7 +1042,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1076,7 +1076,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1109,7 +1109,7 @@
 				PRODUCT_NAME = ProcessingKit;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1142,7 +1142,7 @@
 				PRODUCT_NAME = ProcessingKit;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/ProcessingKit/Core/Extensions/String.swift b/ProcessingKit/Core/Extensions/String.swift
@@ -15,7 +15,7 @@ import Cocoa
 extension String {
     func height(withConstrainedWidth width: CGFloat, font: UIFont) -> CGFloat {
         let constraintRect = CGSize(width: width, height: .greatestFiniteMagnitude)
-        let boundingBox = self.boundingRect(with: constraintRect, options: .usesLineFragmentOrigin, attributes: [NSAttributedStringKey.font: font], context: nil)
+        let boundingBox = self.boundingRect(with: constraintRect, options: .usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font: font], context: nil)
 
         return ceil(boundingBox.height)
     }

diff --git a/ProcessingKit/Core/Input/Gesture.swift b/ProcessingKit/Core/Input/Gesture.swift
@@ -19,7 +19,7 @@ public enum GestureEvent {
     case didTap
     case didRelease
     case didDrag
-    case didSwipe(direction: UISwipeGestureRecognizerDirection)
+    case didSwipe(direction: UISwipeGestureRecognizer.Direction)
     case didPinch(scale: CGFloat, velocity: CGFloat)
     case didRotate(rotation: CGFloat, velocity: CGFloat)
     case didLongPress

diff --git a/ProcessingKit/Core/Typography/Text.swift b/ProcessingKit/Core/Typography/Text.swift
@@ -76,7 +76,7 @@ public struct TextModel: TextModelContract {
         let paragraph = NSMutableParagraphStyle()
         paragraph.alignment = self.textComponents.textAlignX
 
-        let attributes: [NSAttributedStringKey: Any] = [NSAttributedStringKey.paragraphStyle: paragraph]
+        let attributes: [NSAttributedString.Key: Any] = [NSAttributedString.Key.paragraphStyle: paragraph]
 
         let attrString = NSMutableAttributedString(string: str, attributes: attributes)
 
@@ -96,7 +96,7 @@ public struct TextModel: TextModelContract {
     }
 
     public func textWidth(_ str: String) -> CGFloat {
-        let size = str.size(withAttributes: [NSAttributedStringKey.font: self.textComponents.textFont])
+        let size = str.size(withAttributes: [NSAttributedString.Key.font: self.textComponents.textFont])
         return size.width
     }
 

diff --git a/ProcessingKit/ProcessingView.swift b/ProcessingKit/ProcessingView.swift
@@ -24,7 +24,7 @@ import Cocoa
     @objc optional func didTap()
     @objc optional func didRelease()
     @objc optional func didDrag() //Pan
-    @objc optional func didSwipe(direction: UISwipeGestureRecognizerDirection)
+    @objc optional func didSwipe(direction: UISwipeGestureRecognizer.Direction)
     @objc optional func didPinch(scale: CGFloat, velocity: CGFloat)
     @objc optional func didRotate(rotation: CGFloat, velocity: CGFloat)
     @objc optional func didLongPress()