Merge pull request #5 from JosafatCMtz/develop

[Updating] Swift 5
appcoda · Jul 23, 2020 · 3bfac06 · 3bfac06
2 parents 801c5cf + 830de1d
commit 3bfac06
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/Text Detection Starter Project.xcodeproj/project.pbxproj b/Text Detection Starter Project.xcodeproj/project.pbxproj
@@ -96,6 +96,7 @@
 				TargetAttributes = {
 					8B0D6AFA1EFA582B00544F3D = {
 						CreatedOnToolsVersion = 9.0;
+						LastSwiftMigration = 1160;
 					};
 				};
 			};
@@ -269,12 +270,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = YZP52RND5S;
+				DEVELOPMENT_TEAM = 852DX56354;
 				INFOPLIST_FILE = "Text Detection Starter Project/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.appCoda.TextDetection;
+				PRODUCT_BUNDLE_IDENTIFIER = com.josamtz.TextDetection;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -283,12 +284,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = YZP52RND5S;
+				DEVELOPMENT_TEAM = 852DX56354;
 				INFOPLIST_FILE = "Text Detection Starter Project/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.appCoda.TextDetection;
+				PRODUCT_BUNDLE_IDENTIFIER = com.josamtz.TextDetection;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/...oj/project.xcworkspace/xcuserdata/idscomercial.xcuserdatad/UserInterfaceState.xcuserstate b/...oj/project.xcworkspace/xcuserdata/idscomercial.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/... Project.xcodeproj/xcuserdata/idscomercial.xcuserdatad/xcschemes/xcschememanagement.plist b/... Project.xcodeproj/xcuserdata/idscomercial.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Text Detection Starter Project.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Text Detection Starter Project/AppDelegate.swift b/Text Detection Starter Project/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 {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Text Detection Starter Project/Info.plist b/Text Detection Starter Project/Info.plist
@@ -20,6 +20,8 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>for text detection</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -34,8 +36,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSCameraUsageDescription</key>
-	<string>for text detection</string>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/Text Detection Starter Project/ViewController.swift b/Text Detection Starter Project/ViewController.swift
@@ -150,11 +150,11 @@ extension ViewController: AVCaptureVideoDataOutputSampleBufferDelegate {
 
         var requestOptions:[VNImageOption : Any] = [:]
 
-        if let camData = CMGetAttachment(sampleBuffer, kCMSampleBufferAttachmentKey_CameraIntrinsicMatrix, nil) {
+        if let camData = CMGetAttachment(sampleBuffer, key: kCMSampleBufferAttachmentKey_CameraIntrinsicMatrix, attachmentModeOut: nil) {
             requestOptions = [.cameraIntrinsics:camData]
         }
 
-        let imageRequestHandler = VNImageRequestHandler(cvPixelBuffer: pixelBuffer, orientation: 6, options: requestOptions)
+        let imageRequestHandler = VNImageRequestHandler(cvPixelBuffer: pixelBuffer, orientation: CGImagePropertyOrientation(rawValue: 6)!, options: requestOptions)
 
         do {
             try imageRequestHandler.perform(self.requests)