Skip to content

Commit

Permalink
Updated sample license and merged to swift 5.
Browse files Browse the repository at this point in the history
  • Loading branch information
Dominik Cubelic committed Jun 10, 2019
1 parent 11756f9 commit a8643dc
Show file tree
Hide file tree
Showing 26 changed files with 121 additions and 119 deletions.
0 MicroBlink.framework/MicroBlink → MicroBlink.framework/Microblink
View file
File renamed without changes.
21 changes: 11 additions & 10 deletions Samples/BlinkInput-sample-ObjC/BlinkInput-sample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
Expand All @@ -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 = "<group>"; };
3159A58A1CF4805D00641A11 /* MicroBlink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MicroBlink.framework; path = ../../MicroBlink.framework; sourceTree = "<group>"; };
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 = "<group>"; };
B4CCA03022AE4BCD00C76715 /* Microblink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Microblink.framework; path = ../../Microblink.framework; sourceTree = "<group>"; };
B4CCA03122AE4BCD00C76715 /* Microblink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Microblink.bundle; path = ../../Microblink.bundle; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -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 */,
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -192,6 +192,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand All @@ -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;
};
Expand Down
Binary file modified Samples/BlinkInput-sample-ObjC/BlinkInput-sample/License/license.txt
View file
Binary file not shown.
29 changes: 14 additions & 15 deletions Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -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 */
Expand All @@ -33,16 +33,14 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
184958E820AD908400F27C8D /* MicroBlink.framework in Embed Frameworks */,
B4CCA03B22AE4C9900C76715 /* Microblink.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
184958DA20AD8E8700F27C8D /* MicroBlink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MicroBlink.bundle; path = ../../MicroBlink.bundle; sourceTree = "<group>"; };
184958DB20AD8E8700F27C8D /* MicroBlink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MicroBlink.framework; path = ../../MicroBlink.framework; sourceTree = "<group>"; };
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 = "<group>"; };
310E459E1C20612300B546BD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
Expand All @@ -59,6 +57,8 @@
31BF2FD31D95498C008816F3 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
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 = "<group>"; };
B4CCA03622AE4C9300C76715 /* Microblink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Microblink.framework; path = ../../Microblink.framework; sourceTree = "<group>"; };
B4CCA03722AE4C9300C76715 /* Microblink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Microblink.bundle; path = ../../Microblink.bundle; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -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 */,
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -171,7 +171,7 @@
310E45951C20612300B546BD = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = CQTJWP89J7;
LastSwiftMigration = 0900;
LastSwiftMigration = 1020;
};
};
};
Expand All @@ -180,6 +180,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand All @@ -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;
Expand Down Expand Up @@ -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;
};
Expand All @@ -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;
};
Expand Down
2 changes: 1 addition & 1 deletion Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified Samples/BlinkInput-sample-Swift/BlinkInput-sample-Swift/License/license.txt
View file
Binary file not shown.
Loading

0 comments on commit a8643dc

Please sign in to comment.