diff --git a/Podfile.lock b/Podfile.lock
index c110d61e19a416ae756d35d694321a11f611311d..79147c6130287441f67ff11c2fd5813d8ec0264a 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,7 +1,7 @@
PODS:
- BZipCompression (1.0.2)
- FrameAccessor (1.3.2)
- - KeychainAccess (3.0.2)
+ - KeychainAccess (3.1.0)
- mailcore2-ios (0.6.4)
- Onboard (2.3.1)
- OpenSSL-Universal (1.0.2.10)
@@ -23,13 +23,13 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS:
mailcore2-ios:
- :commit: e42f643c6b2b266b678fbfe37f11172db822268c
+ :commit: f783ab13afb9a6e79dfa2fdaedd6cc74324fa880
:git: https://github.com/MailCore/mailcore2.git
SPEC CHECKSUMS:
BZipCompression: e0f96508e60eb93b5f5d4c7de1eb3dd0ac4f9ae9
FrameAccessor: 0f7ba6ce37be9a5d0302a27c731dca70af8d438b
- KeychainAccess: a986406022dfc7c634c691ad3bec670cc6a32002
+ KeychainAccess: 94c5540b32eabf7bc32bfb976a268e8ea05fd6da
mailcore2-ios: 603bf559a9e50327a0f85a7fab7861ab1c042656
Onboard: b6871f25ac753175b2ab9a362fb2feb26a81a311
OpenSSL-Universal: 6dc366764e8bf6ca93c60bd767d9103146a3b3b6
diff --git a/Pods/KeychainAccess/Lib/KeychainAccess/Keychain.swift b/Pods/KeychainAccess/Lib/KeychainAccess/Keychain.swift
index 5adc41a1e8da4daed32076c15a87d00b6b74af34..507304a8a998dcdc19156826479e73c61b13c4d1 100644
--- a/Pods/KeychainAccess/Lib/KeychainAccess/Keychain.swift
+++ b/Pods/KeychainAccess/Lib/KeychainAccess/Keychain.swift
@@ -25,6 +25,9 @@
import Foundation
import Security
+#if os(iOS) || os(OSX)
+import LocalAuthentication
+#endif
public let KeychainAccessErrorDomain = "com.kishikawakatsumi.KeychainAccess.error"
@@ -389,6 +392,13 @@ public final class Keychain {
return options.authenticationPrompt
}
+ #if os(iOS) || os(OSX)
+ @available(iOS 9.0, OSX 10.11, *)
+ public var authenticationContext: LAContext? {
+ return options.authenticationContext as? LAContext
+ }
+ #endif
+
fileprivate let options: Options
// MARK:
@@ -489,6 +499,15 @@ public final class Keychain {
return Keychain(options)
}
+ #if os(iOS) || os(OSX)
+ @available(iOS 9.0, OSX 10.11, *)
+ public func authenticationContext(_ authenticationContext: LAContext) -> Keychain {
+ var options = self.options
+ options.authenticationContext = authenticationContext
+ return Keychain(options)
+ }
+ #endif
+
// MARK:
public func get(_ key: String) throws -> String? {
@@ -1050,6 +1069,7 @@ struct Options {
var comment: String?
var authenticationPrompt: String?
+ var authenticationContext: AnyObject?
var attributes = [String: Any]()
}
@@ -1186,6 +1206,14 @@ extension Options {
}
}
+ #if !os(watchOS)
+ if #available(iOS 9.0, OSX 10.11, *) {
+ if authenticationContext != nil {
+ query[UseAuthenticationContext] = authenticationContext
+ }
+ }
+ #endif
+
return query
}
@@ -1639,7 +1667,7 @@ extension CFError {
var error: NSError {
let domain = CFErrorGetDomain(self) as String
let code = CFErrorGetCode(self)
- let userInfo = CFErrorCopyUserInfo(self) as! [NSObject: Any]
+ let userInfo = CFErrorCopyUserInfo(self) as! [String: Any]
return NSError(domain: domain, code: code, userInfo: userInfo)
}
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
index c110d61e19a416ae756d35d694321a11f611311d..79147c6130287441f67ff11c2fd5813d8ec0264a 100644
--- a/Pods/Manifest.lock
+++ b/Pods/Manifest.lock
@@ -1,7 +1,7 @@
PODS:
- BZipCompression (1.0.2)
- FrameAccessor (1.3.2)
- - KeychainAccess (3.0.2)
+ - KeychainAccess (3.1.0)
- mailcore2-ios (0.6.4)
- Onboard (2.3.1)
- OpenSSL-Universal (1.0.2.10)
@@ -23,13 +23,13 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS:
mailcore2-ios:
- :commit: e42f643c6b2b266b678fbfe37f11172db822268c
+ :commit: f783ab13afb9a6e79dfa2fdaedd6cc74324fa880
:git: https://github.com/MailCore/mailcore2.git
SPEC CHECKSUMS:
BZipCompression: e0f96508e60eb93b5f5d4c7de1eb3dd0ac4f9ae9
FrameAccessor: 0f7ba6ce37be9a5d0302a27c731dca70af8d438b
- KeychainAccess: a986406022dfc7c634c691ad3bec670cc6a32002
+ KeychainAccess: 94c5540b32eabf7bc32bfb976a268e8ea05fd6da
mailcore2-ios: 603bf559a9e50327a0f85a7fab7861ab1c042656
Onboard: b6871f25ac753175b2ab9a362fb2feb26a81a311
OpenSSL-Universal: 6dc366764e8bf6ca93c60bd767d9103146a3b3b6
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
index 00a1eac77f4d31b8c9729ca9f90dc5481890201c..106892667286ed21317008036f81d160de0b5110 100644
--- a/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Pods/Pods.xcodeproj/project.pbxproj
@@ -1153,11 +1153,11 @@
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
- name = Release;
+ name = Debug;
};
13A60F7A91D8E0DEC356A8E064DC2ED3 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = E4CF564127EE3F3C7724F2D63C71600E /* FrameAccessor.xcconfig */;
+ baseConfigurationReference = BE355AD8A2BB8166A69D9FB79412A7F8 /* VENTokenField.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -1305,7 +1305,7 @@
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
- name = Release;
+ name = Debug;
};
731DC216E1A58545B559F6E0A2418060 /* Release */ = {
isa = XCBuildConfiguration;
@@ -1442,7 +1442,7 @@
GCC_PREFIX_HEADER = "Target Support Files/Onboard/Onboard-prefix.pch";
INFOPLIST_FILE = "Target Support Files/Onboard/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = "Target Support Files/Onboard/Onboard.modulemap";
PRODUCT_NAME = Onboard;
@@ -1472,7 +1472,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "Target Support Files/Pods-enzevalos_iphoneTests/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACH_O_TYPE = staticlib;
MODULEMAP_FILE = "Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests.modulemap";
@@ -1483,6 +1483,9 @@
PRODUCT_NAME = Pods_enzevalos_iphoneTests;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
+ SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
@@ -1538,7 +1541,7 @@
GCC_PREFIX_HEADER = "Target Support Files/VENTokenField/VENTokenField-prefix.pch";
INFOPLIST_FILE = "Target Support Files/VENTokenField/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = "Target Support Files/VENTokenField/VENTokenField.modulemap";
PRODUCT_NAME = VENTokenField;
@@ -1711,7 +1714,7 @@
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
- name = Debug;
+ name = Release;
};
/* End XCBuildConfiguration section */
diff --git a/Pods/Target Support Files/KeychainAccess/Info.plist b/Pods/Target Support Files/KeychainAccess/Info.plist
index a080088dc0cb01e811e91efc35f71de0922cf1c0..90db36aa4a915e2afc42e902e7476edd4f761122 100644
--- a/Pods/Target Support Files/KeychainAccess/Info.plist
+++ b/Pods/Target Support Files/KeychainAccess/Info.plist
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>3.0.2</string>
+ <string>3.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
diff --git a/Pods/mailcore2-ios/cocoapods-build/lib/libMailCore-ios.a b/Pods/mailcore2-ios/cocoapods-build/lib/libMailCore-ios.a
index 566c919d4fe4125f7764b51da906089f7a2f0b95..1a24b41ebefa1c35174c41f27abc387876903d00 100644
Binary files a/Pods/mailcore2-ios/cocoapods-build/lib/libMailCore-ios.a and b/Pods/mailcore2-ios/cocoapods-build/lib/libMailCore-ios.a differ