From a8643dcb7ae938c4a5c63f8e7ed5b32f28ef9687 Mon Sep 17 00:00:00 2001 From: Dominik Cubelic Date: Mon, 10 Jun 2019 10:44:07 +0200 Subject: [PATCH] Updated sample license and merged to swift 5. --- .../{MicroBlink => Microblink} | 0 .../project.pbxproj | 21 +++++++------ .../BlinkInput-sample/License/license.txt | Bin 267 -> 180 bytes .../project.pbxproj | 29 +++++++++--------- .../BlinkInput-sample-Swift/AppDelegate.swift | 2 +- .../License/license.txt | Bin 267 -> 180 bytes .../project.pbxproj | 25 +++++++-------- .../DeepOCR-sample-Swift/AppDelegate.swift | 2 +- .../DeepOCR-sample-Swift/License/license.txt | Bin 267 -> 180 bytes .../project.pbxproj | 25 +++++++-------- .../DirectAPI-sample-Swift/AppDelegate.swift | 2 +- .../License/license.txt | Bin 267 -> 180 bytes .../MBCameraViewController.swift | 10 +++--- .../ViewController.swift | 18 +++++------ .../project.pbxproj | 25 +++++++-------- .../AppDelegate.swift | 2 +- .../License/license.txt | Bin 267 -> 180 bytes .../ViewController.swift | 2 +- .../project.pbxproj | 25 +++++++-------- .../Templating-sample-swift/AppDelegate.swift | 2 +- .../License/license.txt | Bin 267 -> 180 bytes .../MBCroatianIDFrontTemplateRecognizer.swift | 1 - .../project.pbxproj | 29 +++++++++--------- .../pdf417-sample-Swift/CustomOverlay.swift | 8 ++--- .../pdf417-sample-Swift/License/license.txt | Bin 267 -> 180 bytes .../pdf417-sample-Swift/ViewController.swift | 12 ++++---- 26 files changed, 121 insertions(+), 119 deletions(-) rename MicroBlink.framework/{MicroBlink => Microblink} (100%) diff --git a/MicroBlink.framework/MicroBlink b/MicroBlink.framework/Microblink similarity index 100% rename from MicroBlink.framework/MicroBlink rename to MicroBlink.framework/Microblink diff --git a/Samples/BlinkInput-sample-ObjC/BlinkInput-sample.xcodeproj/project.pbxproj b/Samples/BlinkInput-sample-ObjC/BlinkInput-sample.xcodeproj/project.pbxproj index 4c6c3cd..9f55197 100644 --- a/Samples/BlinkInput-sample-ObjC/BlinkInput-sample.xcodeproj/project.pbxproj +++ b/Samples/BlinkInput-sample-ObjC/BlinkInput-sample.xcodeproj/project.pbxproj @@ -17,14 +17,14 @@ 18CC81F71B697101000F6DA5 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18CC81F61B697101000F6DA5 /* CoreMedia.framework */; }; 18CC81F91B697106000F6DA5 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18CC81F81B697106000F6DA5 /* AVFoundation.framework */; }; 18CC81FD1B697133000F6DA5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18CC81FC1B697133000F6DA5 /* AudioToolbox.framework */; }; - 3159A58B1CF4805D00641A11 /* MicroBlink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3159A5891CF4805D00641A11 /* MicroBlink.bundle */; }; 3159A5C11CF4A5E900641A11 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3159A5C01CF4A5E900641A11 /* libc++.tbd */; }; 3159A5C31CF4A5F100641A11 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3159A5C21CF4A5F100641A11 /* libiconv.tbd */; }; 3159A5C51CF4A5F400641A11 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3159A5C41CF4A5F400641A11 /* Accelerate.framework */; }; - A2FE135D1F7503A600C6F1EA /* MicroBlink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3159A58A1CF4805D00641A11 /* MicroBlink.framework */; }; - A2FE135E1F7503A600C6F1EA /* MicroBlink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3159A58A1CF4805D00641A11 /* MicroBlink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A2FE13611F7503C200C6F1EA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A2FE13601F7503C200C6F1EA /* libz.tbd */; }; B403EE7820F4D0EC00EE5235 /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = B403EE7720F4D0EC00EE5235 /* license.txt */; }; + B4CCA03322AE4BCD00C76715 /* Microblink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B4CCA03122AE4BCD00C76715 /* Microblink.bundle */; }; + B4CCA03422AE4BD500C76715 /* Microblink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA03022AE4BCD00C76715 /* Microblink.framework */; }; + B4CCA03522AE4BD500C76715 /* Microblink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA03022AE4BCD00C76715 /* Microblink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -34,7 +34,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - A2FE135E1F7503A600C6F1EA /* MicroBlink.framework in Embed Frameworks */, + B4CCA03522AE4BD500C76715 /* Microblink.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -56,13 +56,13 @@ 18CC81F61B697101000F6DA5 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 18CC81F81B697106000F6DA5 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 18CC81FC1B697133000F6DA5 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; - 3159A5891CF4805D00641A11 /* MicroBlink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MicroBlink.bundle; path = ../../MicroBlink.bundle; sourceTree = ""; }; - 3159A58A1CF4805D00641A11 /* MicroBlink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MicroBlink.framework; path = ../../MicroBlink.framework; sourceTree = ""; }; 3159A5C01CF4A5E900641A11 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 3159A5C21CF4A5F100641A11 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; }; 3159A5C41CF4A5F400641A11 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; A2FE13601F7503C200C6F1EA /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; B403EE7720F4D0EC00EE5235 /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = ""; }; + B4CCA03022AE4BCD00C76715 /* Microblink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Microblink.framework; path = ../../Microblink.framework; sourceTree = ""; }; + B4CCA03122AE4BCD00C76715 /* Microblink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Microblink.bundle; path = ../../Microblink.bundle; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -72,9 +72,9 @@ files = ( A2FE13611F7503C200C6F1EA /* libz.tbd in Frameworks */, 3159A5C31CF4A5F100641A11 /* libiconv.tbd in Frameworks */, + B4CCA03422AE4BD500C76715 /* Microblink.framework in Frameworks */, 3159A5C11CF4A5E900641A11 /* libc++.tbd in Frameworks */, 3159A5C51CF4A5F400641A11 /* Accelerate.framework in Frameworks */, - A2FE135D1F7503A600C6F1EA /* MicroBlink.framework in Frameworks */, 18CC81FD1B697133000F6DA5 /* AudioToolbox.framework in Frameworks */, 18CC81F91B697106000F6DA5 /* AVFoundation.framework in Frameworks */, 18CC81F71B697101000F6DA5 /* CoreMedia.framework in Frameworks */, @@ -133,9 +133,9 @@ A2FE13601F7503C200C6F1EA /* libz.tbd */, 3159A5C21CF4A5F100641A11 /* libiconv.tbd */, 3159A5C01CF4A5E900641A11 /* libc++.tbd */, - 3159A5891CF4805D00641A11 /* MicroBlink.bundle */, + B4CCA03122AE4BCD00C76715 /* Microblink.bundle */, + B4CCA03022AE4BCD00C76715 /* Microblink.framework */, 3159A5C41CF4A5F400641A11 /* Accelerate.framework */, - 3159A58A1CF4805D00641A11 /* MicroBlink.framework */, 18CC81FC1B697133000F6DA5 /* AudioToolbox.framework */, 18CC81F81B697106000F6DA5 /* AVFoundation.framework */, 18CC81F61B697101000F6DA5 /* CoreMedia.framework */, @@ -192,6 +192,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -210,12 +211,12 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3159A58B1CF4805D00641A11 /* MicroBlink.bundle in Resources */, 187392121AA4B1070031D6C9 /* Main.storyboard in Resources */, B403EE7820F4D0EC00EE5235 /* license.txt in Resources */, 187392171AA4B1070031D6C9 /* LaunchScreen.xib in Resources */, 186226B71AB1B0A6002D71E5 /* en.strings in Resources */, 187392141AA4B1070031D6C9 /* Images.xcassets in Resources */, + B4CCA03322AE4BCD00C76715 /* Microblink.bundle in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Samples/BlinkInput-sample-ObjC/BlinkInput-sample/License/license.txt b/Samples/BlinkInput-sample-ObjC/BlinkInput-sample/License/license.txt index 4c7465277d6d8d729c907be02a2239e3f60f8649..69fb25a69216c3d35ad5cee774d1f1683ebb41ae 100644 GIT binary patch delta 146 zcmV;D0B!$^0<-~;Dt|16W=EiI1<~dmLIA8Kv4k|x9BYUvPIW&mBD3`P`AfsNOJO6& zT47NckCn#xzg2S>Uy6Ji4LkB;i9htNyao68-zDs@!4yEMW}7AN z`0c?jn|F&(voAbJISW7RuFvh=w2o(Ps_w`{ AssI20 delta 233 zcmV_1xy@s?ezBQdFTC@LNaOlU~_xO~x zjGldI2|%sgI&P+>c%Toa3h!3~|1Q73!P+&KV7z2rnxt#=ozHRPuh%1D*M7dII+W&1 z$=EF2QStg$tNn&qZ|ViV+Ur;)Qk`P;7R8k_;RxjEBjQM4Jz{N7Orl){Y7N!gg6_x` z(zgqQ%Ey~UqRQ9?W^0Qs@x0LxH^;*lH}ezS`!joQ diff --git a/Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift.xcodeproj/project.pbxproj b/Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift.xcodeproj/project.pbxproj index c9778eb..d8467db 100755 --- a/Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift.xcodeproj/project.pbxproj +++ b/Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift.xcodeproj/project.pbxproj @@ -7,9 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 184958DC20AD8E8700F27C8D /* MicroBlink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 184958DA20AD8E8700F27C8D /* MicroBlink.bundle */; }; - 184958DD20AD8E8700F27C8D /* MicroBlink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 184958DB20AD8E8700F27C8D /* MicroBlink.framework */; }; - 184958E820AD908400F27C8D /* MicroBlink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 184958DB20AD8E8700F27C8D /* MicroBlink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 310E459A1C20612300B546BD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 310E45991C20612300B546BD /* AppDelegate.swift */; }; 310E459F1C20612300B546BD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 310E459D1C20612300B546BD /* Main.storyboard */; }; 310E45A11C20612300B546BD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 310E45A01C20612300B546BD /* Assets.xcassets */; }; @@ -24,6 +21,9 @@ 31BF2FD41D95498C008816F3 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BF2FD31D95498C008816F3 /* ViewController.swift */; }; A2FE137A1F75097F00C6F1EA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A2FE13791F75097F00C6F1EA /* libz.tbd */; }; B403EE7B20F4D17A00EE5235 /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = B403EE7A20F4D17A00EE5235 /* license.txt */; }; + B4CCA03922AE4C9300C76715 /* Microblink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B4CCA03722AE4C9300C76715 /* Microblink.bundle */; }; + B4CCA03A22AE4C9900C76715 /* Microblink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA03622AE4C9300C76715 /* Microblink.framework */; }; + B4CCA03B22AE4C9900C76715 /* Microblink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA03622AE4C9300C76715 /* Microblink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -33,7 +33,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 184958E820AD908400F27C8D /* MicroBlink.framework in Embed Frameworks */, + B4CCA03B22AE4C9900C76715 /* Microblink.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -41,8 +41,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 184958DA20AD8E8700F27C8D /* MicroBlink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MicroBlink.bundle; path = ../../MicroBlink.bundle; sourceTree = ""; }; - 184958DB20AD8E8700F27C8D /* MicroBlink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MicroBlink.framework; path = ../../MicroBlink.framework; sourceTree = ""; }; 310E45961C20612300B546BD /* BlinkInput-sample-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BlinkInput-sample-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 310E45991C20612300B546BD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 310E459E1C20612300B546BD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; @@ -59,6 +57,8 @@ 31BF2FD31D95498C008816F3 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; A2FE13791F75097F00C6F1EA /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; B403EE7A20F4D17A00EE5235 /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = ""; }; + B4CCA03622AE4C9300C76715 /* Microblink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Microblink.framework; path = ../../Microblink.framework; sourceTree = ""; }; + B4CCA03722AE4C9300C76715 /* Microblink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Microblink.bundle; path = ../../Microblink.bundle; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -69,7 +69,7 @@ A2FE137A1F75097F00C6F1EA /* libz.tbd in Frameworks */, 310E45E61C206DF600B546BD /* libc++.tbd in Frameworks */, 310E45E41C206DF100B546BD /* libiconv.tbd in Frameworks */, - 184958DD20AD8E8700F27C8D /* MicroBlink.framework in Frameworks */, + B4CCA03A22AE4C9900C76715 /* Microblink.framework in Frameworks */, 3139C9371C32AE72005AC32C /* MobileCoreServices.framework in Frameworks */, 310E45E21C206DEB00B546BD /* CoreMedia.framework in Frameworks */, 310E45E01C206DC100B546BD /* AudioToolbox.framework in Frameworks */, @@ -115,8 +115,8 @@ 310E45AB1C2063F300B546BD /* Frameworks */ = { isa = PBXGroup; children = ( - 184958DA20AD8E8700F27C8D /* MicroBlink.bundle */, - 184958DB20AD8E8700F27C8D /* MicroBlink.framework */, + B4CCA03722AE4C9300C76715 /* Microblink.bundle */, + B4CCA03622AE4C9300C76715 /* Microblink.framework */, 3139C9361C32AE72005AC32C /* MobileCoreServices.framework */, 310E45E11C206DEB00B546BD /* CoreMedia.framework */, 310E45DF1C206DC100B546BD /* AudioToolbox.framework */, @@ -171,7 +171,7 @@ 310E45951C20612300B546BD = { CreatedOnToolsVersion = 7.2; DevelopmentTeam = CQTJWP89J7; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; }; }; @@ -180,6 +180,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -198,10 +199,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 184958DC20AD8E8700F27C8D /* MicroBlink.bundle in Resources */, 310E45A41C20612300B546BD /* LaunchScreen.storyboard in Resources */, 310E45A11C20612300B546BD /* Assets.xcassets in Resources */, B403EE7B20F4D17A00EE5235 /* license.txt in Resources */, + B4CCA03922AE4C9300C76715 /* Microblink.bundle in Resources */, 310E459F1C20612300B546BD /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -358,8 +359,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -375,8 +375,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift/AppDelegate.swift b/Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift/AppDelegate.swift index e7ba38a..76a4086 100755 --- a/Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift/AppDelegate.swift +++ b/Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift/AppDelegate.swift @@ -15,7 +15,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. // Valid until: 2019-07-10 diff --git a/Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift/License/license.txt b/Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift/License/license.txt index 4c7465277d6d8d729c907be02a2239e3f60f8649..69fb25a69216c3d35ad5cee774d1f1683ebb41ae 100644 GIT binary patch delta 146 zcmV;D0B!$^0<-~;Dt|16W=EiI1<~dmLIA8Kv4k|x9BYUvPIW&mBD3`P`AfsNOJO6& zT47NckCn#xzg2S>Uy6Ji4LkB;i9htNyao68-zDs@!4yEMW}7AN z`0c?jn|F&(voAbJISW7RuFvh=w2o(Ps_w`{ AssI20 delta 233 zcmV_1xy@s?ezBQdFTC@LNaOlU~_xO~x zjGldI2|%sgI&P+>c%Toa3h!3~|1Q73!P+&KV7z2rnxt#=ozHRPuh%1D*M7dII+W&1 z$=EF2QStg$tNn&qZ|ViV+Ur;)Qk`P;7R8k_;RxjEBjQM4Jz{N7Orl){Y7N!gg6_x` z(zgqQ%Ey~UqRQ9?W^0Qs@x0LxH^;*lH}ezS`!joQ diff --git a/Samples/DeepOCR-sample-Swift/DeepOCR-sample-Swift.xcodeproj/project.pbxproj b/Samples/DeepOCR-sample-Swift/DeepOCR-sample-Swift.xcodeproj/project.pbxproj index fb1a8bc..659a894 100644 --- a/Samples/DeepOCR-sample-Swift/DeepOCR-sample-Swift.xcodeproj/project.pbxproj +++ b/Samples/DeepOCR-sample-Swift/DeepOCR-sample-Swift.xcodeproj/project.pbxproj @@ -7,9 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 184958E020AD8EBC00F27C8D /* MicroBlink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 184958DE20AD8EBC00F27C8D /* MicroBlink.bundle */; }; - 184958E120AD8EBC00F27C8D /* MicroBlink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 184958DF20AD8EBC00F27C8D /* MicroBlink.framework */; }; - 184958E220AD8EFF00F27C8D /* MicroBlink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 184958DF20AD8EBC00F27C8D /* MicroBlink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A24E097A207B6348000AF21B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A24E0979207B6348000AF21B /* AppDelegate.swift */; }; A24E097C207B6348000AF21B /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A24E097B207B6348000AF21B /* ViewController.swift */; }; A24E097F207B6348000AF21B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A24E097D207B6348000AF21B /* Main.storyboard */; }; @@ -25,6 +22,9 @@ A24E099B207B63D4000AF21B /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A24E099A207B63D4000AF21B /* libiconv.tbd */; }; A24E09A4207B662F000AF21B /* CustomOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = A24E09A3207B662F000AF21B /* CustomOverlay.swift */; }; B403EE7E20F4D1DD00EE5235 /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = B403EE7D20F4D1DD00EE5235 /* license.txt */; }; + B4CCA03E22AE4D9600C76715 /* Microblink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B4CCA03C22AE4D9600C76715 /* Microblink.bundle */; }; + B4CCA04022AE4D9C00C76715 /* Microblink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA03D22AE4D9600C76715 /* Microblink.framework */; }; + B4CCA04122AE4D9C00C76715 /* Microblink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA03D22AE4D9600C76715 /* Microblink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -34,7 +34,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 184958E220AD8EFF00F27C8D /* MicroBlink.framework in Embed Frameworks */, + B4CCA04122AE4D9C00C76715 /* Microblink.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -42,8 +42,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 184958DE20AD8EBC00F27C8D /* MicroBlink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MicroBlink.bundle; path = ../../MicroBlink.bundle; sourceTree = ""; }; - 184958DF20AD8EBC00F27C8D /* MicroBlink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MicroBlink.framework; path = ../../MicroBlink.framework; sourceTree = ""; }; A24E0976207B6348000AF21B /* DeepOCR-sample-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DeepOCR-sample-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; A24E0979207B6348000AF21B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; A24E097B207B6348000AF21B /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -61,6 +59,8 @@ A24E099A207B63D4000AF21B /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; }; A24E09A3207B662F000AF21B /* CustomOverlay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomOverlay.swift; sourceTree = ""; }; B403EE7D20F4D1DD00EE5235 /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = ""; }; + B4CCA03C22AE4D9600C76715 /* Microblink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Microblink.bundle; path = ../../Microblink.bundle; sourceTree = ""; }; + B4CCA03D22AE4D9600C76715 /* Microblink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Microblink.framework; path = ../../Microblink.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -71,7 +71,7 @@ A24E099B207B63D4000AF21B /* libiconv.tbd in Frameworks */, A24E0999207B63CC000AF21B /* libc++.tbd in Frameworks */, A24E0997207B63BC000AF21B /* libz.tbd in Frameworks */, - 184958E120AD8EBC00F27C8D /* MicroBlink.framework in Frameworks */, + B4CCA04022AE4D9C00C76715 /* Microblink.framework in Frameworks */, A24E0995207B6380000AF21B /* MobileCoreServices.framework in Frameworks */, A24E0993207B6379000AF21B /* CoreMedia.framework in Frameworks */, A24E0991207B6374000AF21B /* AudioToolbox.framework in Frameworks */, @@ -118,8 +118,8 @@ A24E098B207B6364000AF21B /* Frameworks */ = { isa = PBXGroup; children = ( - 184958DE20AD8EBC00F27C8D /* MicroBlink.bundle */, - 184958DF20AD8EBC00F27C8D /* MicroBlink.framework */, + B4CCA03C22AE4D9600C76715 /* Microblink.bundle */, + B4CCA03D22AE4D9600C76715 /* Microblink.framework */, A24E0994207B6380000AF21B /* MobileCoreServices.framework */, A24E0992207B6379000AF21B /* CoreMedia.framework */, A24E0990207B6374000AF21B /* AudioToolbox.framework */, @@ -173,6 +173,7 @@ TargetAttributes = { A24E0975207B6348000AF21B = { CreatedOnToolsVersion = 9.3; + LastSwiftMigration = 1020; }; }; }; @@ -200,9 +201,9 @@ buildActionMask = 2147483647; files = ( B403EE7E20F4D1DD00EE5235 /* license.txt in Resources */, - 184958E020AD8EBC00F27C8D /* MicroBlink.bundle in Resources */, A24E0984207B634A000AF21B /* LaunchScreen.storyboard in Resources */, A24E0981207B634A000AF21B /* Assets.xcassets in Resources */, + B4CCA03E22AE4D9600C76715 /* Microblink.bundle in Resources */, A24E097F207B6348000AF21B /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -371,7 +372,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; }; name = Debug; @@ -391,7 +392,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; }; name = Release; diff --git a/Samples/DeepOCR-sample-Swift/DeepOCR-sample-Swift/AppDelegate.swift b/Samples/DeepOCR-sample-Swift/DeepOCR-sample-Swift/AppDelegate.swift index c14016e..23a999e 100644 --- a/Samples/DeepOCR-sample-Swift/DeepOCR-sample-Swift/AppDelegate.swift +++ b/Samples/DeepOCR-sample-Swift/DeepOCR-sample-Swift/AppDelegate.swift @@ -15,7 +15,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. // Valid until: 2019-07-10 diff --git a/Samples/DeepOCR-sample-Swift/DeepOCR-sample-Swift/License/license.txt b/Samples/DeepOCR-sample-Swift/DeepOCR-sample-Swift/License/license.txt index 4c7465277d6d8d729c907be02a2239e3f60f8649..69fb25a69216c3d35ad5cee774d1f1683ebb41ae 100644 GIT binary patch delta 146 zcmV;D0B!$^0<-~;Dt|16W=EiI1<~dmLIA8Kv4k|x9BYUvPIW&mBD3`P`AfsNOJO6& zT47NckCn#xzg2S>Uy6Ji4LkB;i9htNyao68-zDs@!4yEMW}7AN z`0c?jn|F&(voAbJISW7RuFvh=w2o(Ps_w`{ AssI20 delta 233 zcmV_1xy@s?ezBQdFTC@LNaOlU~_xO~x zjGldI2|%sgI&P+>c%Toa3h!3~|1Q73!P+&KV7z2rnxt#=ozHRPuh%1D*M7dII+W&1 z$=EF2QStg$tNn&qZ|ViV+Ur;)Qk`P;7R8k_;RxjEBjQM4Jz{N7Orl){Y7N!gg6_x` z(zgqQ%Ey~UqRQ9?W^0Qs@x0LxH^;*lH}ezS`!joQ diff --git a/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift.xcodeproj/project.pbxproj b/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift.xcodeproj/project.pbxproj index 43178c3..cfab86e 100644 --- a/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift.xcodeproj/project.pbxproj +++ b/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift.xcodeproj/project.pbxproj @@ -7,9 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 184958E520AD8F4800F27C8D /* MicroBlink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 184958E320AD8F4800F27C8D /* MicroBlink.bundle */; }; - 184958E620AD8F4800F27C8D /* MicroBlink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 184958E420AD8F4800F27C8D /* MicroBlink.framework */; }; - 184958E720AD8F5600F27C8D /* MicroBlink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 184958E420AD8F4800F27C8D /* MicroBlink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A207A4A320A485DF002AEDB0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A207A4A220A485DF002AEDB0 /* AppDelegate.swift */; }; A207A4A520A485DF002AEDB0 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A207A4A420A485DF002AEDB0 /* ViewController.swift */; }; A207A4A820A485DF002AEDB0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A207A4A620A485DF002AEDB0 /* Main.storyboard */; }; @@ -24,6 +21,9 @@ A207A4C220A4863E002AEDB0 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A207A4C120A4863E002AEDB0 /* libz.tbd */; }; A207A4CF20A49237002AEDB0 /* MBCameraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A207A4CE20A49237002AEDB0 /* MBCameraViewController.swift */; }; B403EE8120F4D2B700EE5235 /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = B403EE8020F4D2B700EE5235 /* license.txt */; }; + B4CCA04522AE4DFB00C76715 /* Microblink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B4CCA04322AE4DFB00C76715 /* Microblink.bundle */; }; + B4CCA04622AE4E0000C76715 /* Microblink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA04222AE4DFB00C76715 /* Microblink.framework */; }; + B4CCA04722AE4E0000C76715 /* Microblink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA04222AE4DFB00C76715 /* Microblink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -33,7 +33,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 184958E720AD8F5600F27C8D /* MicroBlink.framework in Embed Frameworks */, + B4CCA04722AE4E0000C76715 /* Microblink.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -41,8 +41,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 184958E320AD8F4800F27C8D /* MicroBlink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MicroBlink.bundle; path = ../../MicroBlink.bundle; sourceTree = ""; }; - 184958E420AD8F4800F27C8D /* MicroBlink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MicroBlink.framework; path = ../../MicroBlink.framework; sourceTree = ""; }; A207A49F20A485DF002AEDB0 /* DirectAPI-sample-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DirectAPI-sample-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; A207A4A220A485DF002AEDB0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; A207A4A420A485DF002AEDB0 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -59,6 +57,8 @@ A207A4C120A4863E002AEDB0 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; A207A4CE20A49237002AEDB0 /* MBCameraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MBCameraViewController.swift; sourceTree = ""; }; B403EE8020F4D2B700EE5235 /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = ""; }; + B4CCA04222AE4DFB00C76715 /* Microblink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Microblink.framework; path = ../../Microblink.framework; sourceTree = ""; }; + B4CCA04322AE4DFB00C76715 /* Microblink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Microblink.bundle; path = ../../Microblink.bundle; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -66,9 +66,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 184958E620AD8F4800F27C8D /* MicroBlink.framework in Frameworks */, A207A4BC20A4861D002AEDB0 /* CoreMedia.framework in Frameworks */, A207A4BA20A48616002AEDB0 /* AudioToolbox.framework in Frameworks */, + B4CCA04622AE4E0000C76715 /* Microblink.framework in Frameworks */, A207A4B820A4860F002AEDB0 /* AVFoundation.framework in Frameworks */, A207A4B620A4860A002AEDB0 /* Accelerate.framework in Frameworks */, A207A4C220A4863E002AEDB0 /* libz.tbd in Frameworks */, @@ -115,8 +115,8 @@ A207A4B420A4860A002AEDB0 /* Frameworks */ = { isa = PBXGroup; children = ( - 184958E320AD8F4800F27C8D /* MicroBlink.bundle */, - 184958E420AD8F4800F27C8D /* MicroBlink.framework */, + B4CCA04322AE4DFB00C76715 /* Microblink.bundle */, + B4CCA04222AE4DFB00C76715 /* Microblink.framework */, A207A4BB20A4861C002AEDB0 /* CoreMedia.framework */, A207A4B920A48616002AEDB0 /* AudioToolbox.framework */, A207A4B720A4860F002AEDB0 /* AVFoundation.framework */, @@ -169,6 +169,7 @@ TargetAttributes = { A207A49E20A485DF002AEDB0 = { CreatedOnToolsVersion = 9.3; + LastSwiftMigration = 1020; }; }; }; @@ -195,10 +196,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 184958E520AD8F4800F27C8D /* MicroBlink.bundle in Resources */, B403EE8120F4D2B700EE5235 /* license.txt in Resources */, A207A4AD20A485E0002AEDB0 /* LaunchScreen.storyboard in Resources */, A207A4AA20A485E0002AEDB0 /* Assets.xcassets in Resources */, + B4CCA04522AE4DFB00C76715 /* Microblink.bundle in Resources */, A207A4A820A485DF002AEDB0 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -366,7 +367,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -385,7 +386,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/AppDelegate.swift b/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/AppDelegate.swift index 5fefeef..9659370 100644 --- a/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/AppDelegate.swift +++ b/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/AppDelegate.swift @@ -15,7 +15,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. // Valid until: 2019-07-10 diff --git a/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/License/license.txt b/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/License/license.txt index 4c7465277d6d8d729c907be02a2239e3f60f8649..69fb25a69216c3d35ad5cee774d1f1683ebb41ae 100644 GIT binary patch delta 146 zcmV;D0B!$^0<-~;Dt|16W=EiI1<~dmLIA8Kv4k|x9BYUvPIW&mBD3`P`AfsNOJO6& zT47NckCn#xzg2S>Uy6Ji4LkB;i9htNyao68-zDs@!4yEMW}7AN z`0c?jn|F&(voAbJISW7RuFvh=w2o(Ps_w`{ AssI20 delta 233 zcmV_1xy@s?ezBQdFTC@LNaOlU~_xO~x zjGldI2|%sgI&P+>c%Toa3h!3~|1Q73!P+&KV7z2rnxt#=ozHRPuh%1D*M7dII+W&1 z$=EF2QStg$tNn&qZ|ViV+Ur;)Qk`P;7R8k_;RxjEBjQM4Jz{N7Orl){Y7N!gg6_x` z(zgqQ%Ey~UqRQ9?W^0Qs@x0LxH^;*lH}ezS`!joQ diff --git a/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/MBCameraViewController.swift b/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/MBCameraViewController.swift index 6dcda21..8e2adc4 100644 --- a/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/MBCameraViewController.swift +++ b/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/MBCameraViewController.swift @@ -56,10 +56,10 @@ class MBCameraViewController: UIViewController, AVCaptureAudioDataOutputSampleBu } func addNotificationObserver() { - NotificationCenter.default.addObserver(self, selector: #selector(MBCameraViewController.appplicationWillResignActive(_:)), name: .UIApplicationWillResignActive, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(MBCameraViewController.appplicationWillEnterForeground(_:)), name: .UIApplicationWillEnterForeground, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(MBCameraViewController.applicationDidEnterBackgroundNotification(_:)), name: .UIApplicationDidEnterBackground, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(MBCameraViewController.applicationWillTerminateNotification(_:)), name: .UIApplicationWillTerminate, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(MBCameraViewController.appplicationWillResignActive(_:)), name: UIApplication.willResignActiveNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(MBCameraViewController.appplicationWillEnterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(MBCameraViewController.applicationDidEnterBackgroundNotification(_:)), name: UIApplication.didEnterBackgroundNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(MBCameraViewController.applicationWillTerminateNotification(_:)), name: UIApplication.willTerminateNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(MBCameraViewController.captureSessionDidStartRunning(_:)), name: .AVCaptureSessionDidStartRunning, object: nil) NotificationCenter.default.addObserver(self, selector :#selector(MBCameraViewController.captureSessionDidStopRunning(_:)), name: .AVCaptureSessionDidStopRunning, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(MBCameraViewController.captureSessionRuntimeErrorNotification(_:)), name: .AVCaptureSessionRuntimeError, object: nil) @@ -188,7 +188,7 @@ class MBCameraViewController: UIViewController, AVCaptureAudioDataOutputSampleBu DispatchQueue.main.async(execute: {() -> Void in let title = "PDF417" // Save the string representation of the code - let message = self.pdf417Recognizer?.result.stringData() + let message = self.pdf417Recognizer?.result.stringData let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert) let okAction = UIAlertAction(title: "OK", style: .default, handler: {(_ action: UIAlertAction) -> Void in self.dismiss(animated: true) {() -> Void in } diff --git a/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/ViewController.swift b/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/ViewController.swift index 04068d3..24a5004 100644 --- a/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/ViewController.swift +++ b/Samples/DirectAPI-sample-Swift/DirectAPI-sample-Swift/ViewController.swift @@ -42,16 +42,17 @@ class ViewController: UIViewController, UIImagePickerControllerDelegate, UINavig } - func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) { - let mediaType = info[UIImagePickerControllerMediaType] as? String - // Handle a still image capture - if CFStringCompare(mediaType as CFString?, kUTTypeImage, CFStringCompareFlags(rawValue: 0)) == .compareEqualTo { - let originalImage = info[UIImagePickerControllerOriginalImage] as? UIImage + func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) { + let mediaType = info[UIImagePickerController.InfoKey.mediaType] as? String + + if CFStringCompare(mediaType as CFString?, kUTTypeImage, CFStringCompareFlags(rawValue: 9)) == .compareEqualTo { + let originalImage = info[UIImagePickerController.InfoKey.originalImage] as? UIImage processImageRunner(originalImage) } - picker.dismiss(animated: true) {() -> Void in } + + picker.dismiss(animated: true, completion: nil) } - + func setupRecognizerRunner() { var recognizers = [MBRecognizer]() pdf417Recognizer = MBPdf417Recognizer() @@ -78,7 +79,7 @@ class ViewController: UIViewController, UIImagePickerControllerDelegate, UINavig DispatchQueue.main.async(execute: {() -> Void in let title = "PDF417" // Save the string representation of the code - let message = self.pdf417Recognizer?.result.stringData() + let message = self.pdf417Recognizer?.result.stringData let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert) let okAction = UIAlertAction(title: "OK", style: .default, handler: {(_ action: UIAlertAction) -> Void in self.dismiss(animated: true) {() -> Void in } @@ -88,4 +89,3 @@ class ViewController: UIViewController, UIImagePickerControllerDelegate, UINavig }) } } - diff --git a/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift.xcodeproj/project.pbxproj b/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift.xcodeproj/project.pbxproj index dac73ad..707b5e0 100644 --- a/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift.xcodeproj/project.pbxproj +++ b/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift.xcodeproj/project.pbxproj @@ -7,9 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 184958D820AD8E4700F27C8D /* MicroBlink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 184958D620AD8E4600F27C8D /* MicroBlink.bundle */; }; - 184958D920AD8E4700F27C8D /* MicroBlink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 184958D720AD8E4700F27C8D /* MicroBlink.framework */; }; - 184958E920AD90B900F27C8D /* MicroBlink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 184958D720AD8E4700F27C8D /* MicroBlink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A207A42F20A44199002AEDB0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A207A42E20A44199002AEDB0 /* AppDelegate.swift */; }; A207A43120A44199002AEDB0 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A207A43020A44199002AEDB0 /* ViewController.swift */; }; A207A43420A44199002AEDB0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A207A43220A44199002AEDB0 /* Main.storyboard */; }; @@ -25,6 +22,9 @@ A207A45020A44211002AEDB0 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A207A44F20A44211002AEDB0 /* libz.tbd */; }; A207A45B20A4467B002AEDB0 /* MBGenericPreset.swift in Sources */ = {isa = PBXBuildFile; fileRef = A207A45A20A4467B002AEDB0 /* MBGenericPreset.swift */; }; B403EE8420F4D38400EE5235 /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = B403EE8320F4D38400EE5235 /* license.txt */; }; + B4CCA04A22AE4EA700C76715 /* Microblink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B4CCA04822AE4EA700C76715 /* Microblink.bundle */; }; + B4CCA04C22AE4EAD00C76715 /* Microblink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA04922AE4EA700C76715 /* Microblink.framework */; }; + B4CCA04D22AE4EAD00C76715 /* Microblink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA04922AE4EA700C76715 /* Microblink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -34,7 +34,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 184958E920AD90B900F27C8D /* MicroBlink.framework in Embed Frameworks */, + B4CCA04D22AE4EAD00C76715 /* Microblink.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -42,8 +42,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 184958D620AD8E4600F27C8D /* MicroBlink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MicroBlink.bundle; path = ../../MicroBlink.bundle; sourceTree = ""; }; - 184958D720AD8E4700F27C8D /* MicroBlink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MicroBlink.framework; path = ../../MicroBlink.framework; sourceTree = ""; }; A207A42B20A44199002AEDB0 /* FieldByField-sample-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FieldByField-sample-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; A207A42E20A44199002AEDB0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; A207A43020A44199002AEDB0 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -61,6 +59,8 @@ A207A44F20A44211002AEDB0 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; A207A45A20A4467B002AEDB0 /* MBGenericPreset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MBGenericPreset.swift; sourceTree = ""; }; B403EE8320F4D38400EE5235 /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = ""; }; + B4CCA04822AE4EA700C76715 /* Microblink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Microblink.bundle; path = ../../Microblink.bundle; sourceTree = ""; }; + B4CCA04922AE4EA700C76715 /* Microblink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Microblink.framework; path = ../../Microblink.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -71,7 +71,7 @@ A207A45020A44211002AEDB0 /* libz.tbd in Frameworks */, A207A44E20A44207002AEDB0 /* libc++.tbd in Frameworks */, A207A44C20A441F9002AEDB0 /* libiconv.tbd in Frameworks */, - 184958D920AD8E4700F27C8D /* MicroBlink.framework in Frameworks */, + B4CCA04C22AE4EAD00C76715 /* Microblink.framework in Frameworks */, A207A44A20A441E5002AEDB0 /* MobileCoreServices.framework in Frameworks */, A207A44820A441D7002AEDB0 /* CoreMedia.framework in Frameworks */, A207A44620A441D1002AEDB0 /* AudioToolbox.framework in Frameworks */, @@ -118,8 +118,8 @@ A207A44020A441BE002AEDB0 /* Frameworks */ = { isa = PBXGroup; children = ( - 184958D620AD8E4600F27C8D /* MicroBlink.bundle */, - 184958D720AD8E4700F27C8D /* MicroBlink.framework */, + B4CCA04822AE4EA700C76715 /* Microblink.bundle */, + B4CCA04922AE4EA700C76715 /* Microblink.framework */, A207A44920A441E5002AEDB0 /* MobileCoreServices.framework */, A207A44720A441D7002AEDB0 /* CoreMedia.framework */, A207A44520A441D1002AEDB0 /* AudioToolbox.framework */, @@ -173,6 +173,7 @@ TargetAttributes = { A207A42A20A44199002AEDB0 = { CreatedOnToolsVersion = 9.3; + LastSwiftMigration = 1020; }; }; }; @@ -199,10 +200,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 184958D820AD8E4700F27C8D /* MicroBlink.bundle in Resources */, A207A43920A4419A002AEDB0 /* LaunchScreen.storyboard in Resources */, A207A43620A4419A002AEDB0 /* Assets.xcassets in Resources */, A207A43420A44199002AEDB0 /* Main.storyboard in Resources */, + B4CCA04A22AE4EA700C76715 /* Microblink.bundle in Resources */, B403EE8420F4D38400EE5235 /* license.txt in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -370,7 +371,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -389,7 +390,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift/AppDelegate.swift b/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift/AppDelegate.swift index 33a0647..68fc8fc 100644 --- a/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift/AppDelegate.swift +++ b/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift/AppDelegate.swift @@ -15,7 +15,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. // Valid until: 2019-07-10 diff --git a/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift/License/license.txt b/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift/License/license.txt index 4c7465277d6d8d729c907be02a2239e3f60f8649..69fb25a69216c3d35ad5cee774d1f1683ebb41ae 100644 GIT binary patch delta 146 zcmV;D0B!$^0<-~;Dt|16W=EiI1<~dmLIA8Kv4k|x9BYUvPIW&mBD3`P`AfsNOJO6& zT47NckCn#xzg2S>Uy6Ji4LkB;i9htNyao68-zDs@!4yEMW}7AN z`0c?jn|F&(voAbJISW7RuFvh=w2o(Ps_w`{ AssI20 delta 233 zcmV_1xy@s?ezBQdFTC@LNaOlU~_xO~x zjGldI2|%sgI&P+>c%Toa3h!3~|1Q73!P+&KV7z2rnxt#=ozHRPuh%1D*M7dII+W&1 z$=EF2QStg$tNn&qZ|ViV+Ur;)Qk`P;7R8k_;RxjEBjQM4Jz{N7Orl){Y7N!gg6_x` z(zgqQ%Ey~UqRQ9?W^0Qs@x0LxH^;*lH}ezS`!joQ diff --git a/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift/ViewController.swift b/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift/ViewController.swift index 38a21c8..7b71085 100644 --- a/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift/ViewController.swift +++ b/Samples/FieldByField-sample-Swift/FieldByField-sample-Swift/ViewController.swift @@ -55,7 +55,7 @@ extension ViewController : MBFieldByFieldOverlayViewControllerDelegate { description += "\(key): \(value)\n" } - let alert = UIAlertController(title: "Field by field Result", message: "\(description)", preferredStyle: UIAlertControllerStyle.alert) + let alert = UIAlertController(title: "Field by field Result", message: "\(description)", preferredStyle: UIAlertController.Style.alert) alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in self.dismiss(animated: true, completion: nil) })) diff --git a/Samples/Templating-sample-swift/Templating-sample-swift.xcodeproj/project.pbxproj b/Samples/Templating-sample-swift/Templating-sample-swift.xcodeproj/project.pbxproj index 45a7b26..0abb234 100644 --- a/Samples/Templating-sample-swift/Templating-sample-swift.xcodeproj/project.pbxproj +++ b/Samples/Templating-sample-swift/Templating-sample-swift.xcodeproj/project.pbxproj @@ -7,9 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 184958F120AD917500F27C8D /* MicroBlink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 184958EF20AD917500F27C8D /* MicroBlink.bundle */; }; - 184958F220AD917500F27C8D /* MicroBlink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 184958F020AD917500F27C8D /* MicroBlink.framework */; }; - 184958F320AD917800F27C8D /* MicroBlink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 184958F020AD917500F27C8D /* MicroBlink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A207A46920A45C7A002AEDB0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A207A46820A45C7A002AEDB0 /* AppDelegate.swift */; }; A207A46B20A45C7A002AEDB0 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A207A46A20A45C7A002AEDB0 /* ViewController.swift */; }; A207A46E20A45C7A002AEDB0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A207A46C20A45C7A002AEDB0 /* Main.storyboard */; }; @@ -25,6 +22,9 @@ A207A49320A45E16002AEDB0 /* MBCroatianIDTemplateUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = A207A49220A45E16002AEDB0 /* MBCroatianIDTemplateUtils.swift */; }; A207A49520A47A67002AEDB0 /* MBCroatianIDFrontTemplateRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A207A49420A47A67002AEDB0 /* MBCroatianIDFrontTemplateRecognizer.swift */; }; B403EE8A20F4D4EC00EE5235 /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = B403EE8920F4D4EC00EE5235 /* license.txt */; }; + B4CCA05722AE4F5800C76715 /* Microblink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B4CCA05522AE4F5800C76715 /* Microblink.bundle */; }; + B4CCA05822AE4F5D00C76715 /* Microblink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA05422AE4F5800C76715 /* Microblink.framework */; }; + B4CCA05922AE4F5D00C76715 /* Microblink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA05422AE4F5800C76715 /* Microblink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -34,7 +34,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 184958F320AD917800F27C8D /* MicroBlink.framework in Embed Frameworks */, + B4CCA05922AE4F5D00C76715 /* Microblink.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -42,8 +42,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 184958EF20AD917500F27C8D /* MicroBlink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MicroBlink.bundle; path = ../../MicroBlink.bundle; sourceTree = ""; }; - 184958F020AD917500F27C8D /* MicroBlink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MicroBlink.framework; path = ../../MicroBlink.framework; sourceTree = ""; }; A207A46520A45C7A002AEDB0 /* Templating-sample-swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Templating-sample-swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; A207A46820A45C7A002AEDB0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; A207A46A20A45C7A002AEDB0 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -61,6 +59,8 @@ A207A49220A45E16002AEDB0 /* MBCroatianIDTemplateUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MBCroatianIDTemplateUtils.swift; sourceTree = ""; }; A207A49420A47A67002AEDB0 /* MBCroatianIDFrontTemplateRecognizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MBCroatianIDFrontTemplateRecognizer.swift; sourceTree = ""; }; B403EE8920F4D4EC00EE5235 /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = ""; }; + B4CCA05422AE4F5800C76715 /* Microblink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Microblink.framework; path = ../../Microblink.framework; sourceTree = ""; }; + B4CCA05522AE4F5800C76715 /* Microblink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Microblink.bundle; path = ../../Microblink.bundle; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -70,12 +70,12 @@ files = ( A207A48820A45D32002AEDB0 /* libz.tbd in Frameworks */, A207A48620A45D2C002AEDB0 /* libiconv.tbd in Frameworks */, - 184958F220AD917500F27C8D /* MicroBlink.framework in Frameworks */, A207A48420A45D26002AEDB0 /* libc++.tbd in Frameworks */, A207A48220A45D1D002AEDB0 /* AudioToolbox.framework in Frameworks */, A207A48020A45D17002AEDB0 /* Accelerate.framework in Frameworks */, A207A47E20A45D0B002AEDB0 /* CoreMedia.framework in Frameworks */, A207A47C20A45D06002AEDB0 /* AVFoundation.framework in Frameworks */, + B4CCA05822AE4F5D00C76715 /* Microblink.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -121,8 +121,8 @@ A207A48720A45D32002AEDB0 /* libz.tbd */, A207A48520A45D2C002AEDB0 /* libiconv.tbd */, A207A48320A45D26002AEDB0 /* libc++.tbd */, - 184958EF20AD917500F27C8D /* MicroBlink.bundle */, - 184958F020AD917500F27C8D /* MicroBlink.framework */, + B4CCA05522AE4F5800C76715 /* Microblink.bundle */, + B4CCA05422AE4F5800C76715 /* Microblink.framework */, A207A48120A45D1D002AEDB0 /* AudioToolbox.framework */, A207A47F20A45D17002AEDB0 /* Accelerate.framework */, A207A47D20A45D0B002AEDB0 /* CoreMedia.framework */, @@ -172,6 +172,7 @@ TargetAttributes = { A207A46420A45C7A002AEDB0 = { CreatedOnToolsVersion = 9.3; + LastSwiftMigration = 1020; }; }; }; @@ -198,10 +199,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 184958F120AD917500F27C8D /* MicroBlink.bundle in Resources */, B403EE8A20F4D4EC00EE5235 /* license.txt in Resources */, A207A47320A45C7C002AEDB0 /* LaunchScreen.storyboard in Resources */, A207A47020A45C7C002AEDB0 /* Assets.xcassets in Resources */, + B4CCA05722AE4F5800C76715 /* Microblink.bundle in Resources */, A207A46E20A45C7A002AEDB0 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -371,7 +372,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -391,7 +392,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Samples/Templating-sample-swift/Templating-sample-swift/AppDelegate.swift b/Samples/Templating-sample-swift/Templating-sample-swift/AppDelegate.swift index 459ec08..00435c3 100644 --- a/Samples/Templating-sample-swift/Templating-sample-swift/AppDelegate.swift +++ b/Samples/Templating-sample-swift/Templating-sample-swift/AppDelegate.swift @@ -15,7 +15,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. // Valid until: 2019-07-10 diff --git a/Samples/Templating-sample-swift/Templating-sample-swift/License/license.txt b/Samples/Templating-sample-swift/Templating-sample-swift/License/license.txt index 4c7465277d6d8d729c907be02a2239e3f60f8649..69fb25a69216c3d35ad5cee774d1f1683ebb41ae 100644 GIT binary patch delta 146 zcmV;D0B!$^0<-~;Dt|16W=EiI1<~dmLIA8Kv4k|x9BYUvPIW&mBD3`P`AfsNOJO6& zT47NckCn#xzg2S>Uy6Ji4LkB;i9htNyao68-zDs@!4yEMW}7AN z`0c?jn|F&(voAbJISW7RuFvh=w2o(Ps_w`{ AssI20 delta 233 zcmV_1xy@s?ezBQdFTC@LNaOlU~_xO~x zjGldI2|%sgI&P+>c%Toa3h!3~|1Q73!P+&KV7z2rnxt#=ozHRPuh%1D*M7dII+W&1 z$=EF2QStg$tNn&qZ|ViV+Ur;)Qk`P;7R8k_;RxjEBjQM4Jz{N7Orl){Y7N!gg6_x` z(zgqQ%Ey~UqRQ9?W^0Qs@x0LxH^;*lH}ezS`!joQ diff --git a/Samples/Templating-sample-swift/Templating-sample-swift/MBCroatianIDFrontTemplateRecognizer.swift b/Samples/Templating-sample-swift/Templating-sample-swift/MBCroatianIDFrontTemplateRecognizer.swift index 8cd3556..90b940f 100644 --- a/Samples/Templating-sample-swift/Templating-sample-swift/MBCroatianIDFrontTemplateRecognizer.swift +++ b/Samples/Templating-sample-swift/Templating-sample-swift/MBCroatianIDFrontTemplateRecognizer.swift @@ -132,7 +132,6 @@ class MBCroatianIDFrontTemplateRecognizer : NSObject { citizenshipParser?.endWithWhitespace = true citizenshipParser?.startWithWhitespace = true oldDocumentNumberParser = MBRegexParser(regex: "\\d{9}") - oldDocumentNumberParser?.ocrEngineOptions.minimalLineHeight = 35 neDocumentNumberParser = oldDocumentNumberParser?.copy() as? MBRegexParser dateOfBirthParser = MBDateParser() diff --git a/Samples/pdf417-sample-Swift/pdf417-sample-Swift.xcodeproj/project.pbxproj b/Samples/pdf417-sample-Swift/pdf417-sample-Swift.xcodeproj/project.pbxproj index f6670a2..79cede9 100755 --- a/Samples/pdf417-sample-Swift/pdf417-sample-Swift.xcodeproj/project.pbxproj +++ b/Samples/pdf417-sample-Swift/pdf417-sample-Swift.xcodeproj/project.pbxproj @@ -7,9 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 184958EC20AD90F000F27C8D /* MicroBlink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 184958EA20AD90F000F27C8D /* MicroBlink.bundle */; }; - 184958ED20AD90F000F27C8D /* MicroBlink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 184958EB20AD90F000F27C8D /* MicroBlink.framework */; }; - 184958EE20AD912100F27C8D /* MicroBlink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 184958EB20AD90F000F27C8D /* MicroBlink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3139C81B1C22B2AC005AC32C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3139C81A1C22B2AC005AC32C /* AppDelegate.swift */; }; 3139C81D1C22B2AC005AC32C /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3139C81C1C22B2AC005AC32C /* ViewController.swift */; }; 3139C8201C22B2AC005AC32C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3139C81E1C22B2AC005AC32C /* Main.storyboard */; }; @@ -24,6 +21,9 @@ A288D47B2073B5F20042A45F /* CustomOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = A288D47A2073B5F20042A45F /* CustomOverlay.swift */; }; A2FE137F1F75106F00C6F1EA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A2FE137E1F75106F00C6F1EA /* libz.tbd */; }; B403EE8720F4D48200EE5235 /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = B403EE8620F4D48200EE5235 /* license.txt */; }; + B4CCA05022AE4EEA00C76715 /* Microblink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B4CCA04E22AE4EEA00C76715 /* Microblink.bundle */; }; + B4CCA05222AE4EEE00C76715 /* Microblink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA04F22AE4EEA00C76715 /* Microblink.framework */; }; + B4CCA05322AE4EEE00C76715 /* Microblink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA04F22AE4EEA00C76715 /* Microblink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -33,7 +33,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 184958EE20AD912100F27C8D /* MicroBlink.framework in Embed Frameworks */, + B4CCA05322AE4EEE00C76715 /* Microblink.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -41,8 +41,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 184958EA20AD90F000F27C8D /* MicroBlink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MicroBlink.bundle; path = ../../MicroBlink.bundle; sourceTree = ""; }; - 184958EB20AD90F000F27C8D /* MicroBlink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MicroBlink.framework; path = ../../MicroBlink.framework; sourceTree = ""; }; 3139C8171C22B2AC005AC32C /* pdf417-sample-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "pdf417-sample-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 3139C81A1C22B2AC005AC32C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 3139C81C1C22B2AC005AC32C /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -59,6 +57,8 @@ A288D47A2073B5F20042A45F /* CustomOverlay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomOverlay.swift; sourceTree = ""; }; A2FE137E1F75106F00C6F1EA /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; B403EE8620F4D48200EE5235 /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = ""; }; + B4CCA04E22AE4EEA00C76715 /* Microblink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Microblink.bundle; path = ../../Microblink.bundle; sourceTree = ""; }; + B4CCA04F22AE4EEA00C76715 /* Microblink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Microblink.framework; path = ../../Microblink.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -68,7 +68,7 @@ files = ( A2FE137F1F75106F00C6F1EA /* libz.tbd in Frameworks */, 3139C8381C22B33E005AC32C /* libiconv.tbd in Frameworks */, - 184958ED20AD90F000F27C8D /* MicroBlink.framework in Frameworks */, + B4CCA05222AE4EEE00C76715 /* Microblink.framework in Frameworks */, 3139C8361C22B338005AC32C /* libc++.tbd in Frameworks */, 3139C8341C22B333005AC32C /* AudioToolbox.framework in Frameworks */, 3139C8321C22B324005AC32C /* CoreMedia.framework in Frameworks */, @@ -118,8 +118,8 @@ A2FE137E1F75106F00C6F1EA /* libz.tbd */, 3139C8371C22B33E005AC32C /* libiconv.tbd */, 3139C8351C22B338005AC32C /* libc++.tbd */, - 184958EA20AD90F000F27C8D /* MicroBlink.bundle */, - 184958EB20AD90F000F27C8D /* MicroBlink.framework */, + B4CCA04E22AE4EEA00C76715 /* Microblink.bundle */, + B4CCA04F22AE4EEA00C76715 /* Microblink.framework */, 3139C8331C22B333005AC32C /* AudioToolbox.framework */, 3139C8311C22B324005AC32C /* CoreMedia.framework */, 3139C82F1C22B31D005AC32C /* AVFoundation.framework */, @@ -171,7 +171,7 @@ 3139C8161C22B2AC005AC32C = { CreatedOnToolsVersion = 7.2; DevelopmentTeam = CQTJWP89J7; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; }; }; @@ -180,6 +180,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -198,10 +199,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 184958EC20AD90F000F27C8D /* MicroBlink.bundle in Resources */, 3139C8251C22B2AC005AC32C /* LaunchScreen.storyboard in Resources */, B403EE8720F4D48200EE5235 /* license.txt in Resources */, 3139C8221C22B2AC005AC32C /* Assets.xcassets in Resources */, + B4CCA05022AE4EEA00C76715 /* Microblink.bundle in Resources */, 3139C8201C22B2AC005AC32C /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -374,8 +375,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -390,8 +390,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Samples/pdf417-sample-Swift/pdf417-sample-Swift/CustomOverlay.swift b/Samples/pdf417-sample-Swift/pdf417-sample-Swift/CustomOverlay.swift index c748ec7..86ffe74 100644 --- a/Samples/pdf417-sample-Swift/pdf417-sample-Swift/CustomOverlay.swift +++ b/Samples/pdf417-sample-Swift/pdf417-sample-Swift/CustomOverlay.swift @@ -35,19 +35,19 @@ class CustomOverlay: MBCustomOverlayViewController, MBScanningRecognizerRunnerVi if recognizer is MBBarcodeRecognizer { let barcodeRecognizer = recognizer as? MBBarcodeRecognizer title = "QR Code" - message = (barcodeRecognizer?.result.stringData())! + message = (barcodeRecognizer?.result.stringData)! } else if recognizer is MBPdf417Recognizer { let pdf417Recognizer = recognizer as? MBPdf417Recognizer title = "PDF417" - message = (pdf417Recognizer?.result.stringData())! + message = (pdf417Recognizer?.result.stringData)! } } } - let alertController: UIAlertController = UIAlertController.init(title: title, message: message, preferredStyle: UIAlertControllerStyle.alert) + let alertController: UIAlertController = UIAlertController.init(title: title, message: message, preferredStyle: UIAlertController.Style.alert) - let okAction: UIAlertAction = UIAlertAction.init(title: "OK", style: UIAlertActionStyle.default, + let okAction: UIAlertAction = UIAlertAction.init(title: "OK", style: UIAlertAction.Style.default, handler: { (action) -> Void in self.dismiss(animated: true, completion: nil) }) diff --git a/Samples/pdf417-sample-Swift/pdf417-sample-Swift/License/license.txt b/Samples/pdf417-sample-Swift/pdf417-sample-Swift/License/license.txt index 4c7465277d6d8d729c907be02a2239e3f60f8649..69fb25a69216c3d35ad5cee774d1f1683ebb41ae 100644 GIT binary patch delta 146 zcmV;D0B!$^0<-~;Dt|16W=EiI1<~dmLIA8Kv4k|x9BYUvPIW&mBD3`P`AfsNOJO6& zT47NckCn#xzg2S>Uy6Ji4LkB;i9htNyao68-zDs@!4yEMW}7AN z`0c?jn|F&(voAbJISW7RuFvh=w2o(Ps_w`{ AssI20 delta 233 zcmV_1xy@s?ezBQdFTC@LNaOlU~_xO~x zjGldI2|%sgI&P+>c%Toa3h!3~|1Q73!P+&KV7z2rnxt#=ozHRPuh%1D*M7dII+W&1 z$=EF2QStg$tNn&qZ|ViV+Ur;)Qk`P;7R8k_;RxjEBjQM4Jz{N7Orl){Y7N!gg6_x` z(zgqQ%Ey~UqRQ9?W^0Qs@x0LxH^;*lH}ezS`!joQ diff --git a/Samples/pdf417-sample-Swift/pdf417-sample-Swift/ViewController.swift b/Samples/pdf417-sample-Swift/pdf417-sample-Swift/ViewController.swift index 1e19cf6..ffe884e 100644 --- a/Samples/pdf417-sample-Swift/pdf417-sample-Swift/ViewController.swift +++ b/Samples/pdf417-sample-Swift/pdf417-sample-Swift/ViewController.swift @@ -25,7 +25,7 @@ class ViewController: UIViewController { /** Create barcode recognizer */ self.barcodeRecognizer = MBBarcodeRecognizer() - self.barcodeRecognizer?.scanQR = true + self.barcodeRecognizer?.scanQrCode = true self.pdf417Recognizer = MBPdf417Recognizer() @@ -49,7 +49,7 @@ class ViewController: UIViewController { /** Create barcode recognizer */ self.barcodeRecognizer = MBBarcodeRecognizer() - self.barcodeRecognizer?.scanQR = true + self.barcodeRecognizer?.scanQrCode = true self.pdf417Recognizer = MBPdf417Recognizer() @@ -84,22 +84,22 @@ extension ViewController: MBBarcodeOverlayViewControllerDelegate { title = "QR Code" // Save the string representation of the code - message = self.barcodeRecognizer!.result.stringData() + message = self.barcodeRecognizer!.result.stringData! } else if (self.pdf417Recognizer!.result.resultState == MBRecognizerResultState.valid) { title = "PDF417" // Save the string representation of the code - message = self.pdf417Recognizer!.result.stringData() + message = self.pdf417Recognizer!.result.stringData! } /** Needs to be called on main thread beacuse everything prior is on background thread */ DispatchQueue.main.async { // present the alert view with scanned results - let alertController: UIAlertController = UIAlertController.init(title: title, message: message, preferredStyle: UIAlertControllerStyle.alert) + let alertController: UIAlertController = UIAlertController.init(title: title, message: message, preferredStyle: UIAlertController.Style.alert) - let okAction: UIAlertAction = UIAlertAction.init(title: "OK", style: UIAlertActionStyle.default, + let okAction: UIAlertAction = UIAlertAction.init(title: "OK", style: UIAlertAction.Style.default, handler: { (action) -> Void in self.dismiss(animated: true, completion: nil) })