Merge pull request #20 from ajijoyo/master

Support Swift 5
CameraKit · Jun 30, 2019 · 455de99 · 455de99
2 parents c0c0eb7 + 4b5349e
commit 455de99
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CameraKit-iOS.podspec b/CameraKit-iOS.podspec
@@ -1,7 +1,8 @@
 Pod::Spec.new do |s|
 
   s.name              = "CameraKit-iOS"
-  s.version           = "1.2.0"
+  s.version           = "1.2.1"
+  s.swift_version     = "5"
   s.summary           = "Camera library for iOS written in pure Swift."
   s.description       = "Easy to work with, camera library for iOS written in pure Swift."
   s.homepage          = "https://camerakit.io/"

diff --git a/CameraKit/CameraKit.xcodeproj/project.pbxproj b/CameraKit/CameraKit.xcodeproj/project.pbxproj
@@ -169,7 +169,7 @@
 				TargetAttributes = {
 					3AD9372021E53B97006A8C86 = {
 						CreatedOnToolsVersion = 10.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1020;
 					};
 					3AD9372921E53B97006A8C86 = {
 						CreatedOnToolsVersion = 10.1;
@@ -390,7 +390,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -417,7 +417,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.wonderkiln.CameraKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/CameraKit/CameraKit/CKFUtils.swift b/CameraKit/CameraKit/CKFUtils.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 private extension UIDeviceOrientation {
-    var imageOrientation: UIImageOrientation {
+    var imageOrientation: UIImage.Orientation {
         switch self {
         case .portraitUpsideDown:
             return .left
@@ -22,7 +22,7 @@ private extension UIDeviceOrientation {
         }
     }
 
-    var imageOrientationMirrored: UIImageOrientation {
+    var imageOrientationMirrored: UIImage.Orientation {
         switch self {
         case .portraitUpsideDown:
             return .left