Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ios): update minimum target to iOS 11 #142

Merged
merged 3 commits into from
Feb 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ library 'pipeline-library'
def isMaster = env.BRANCH_NAME.equals('master')

buildModule {
sdkVersion = '9.2.0.v20200911073932' // use a master build with ARM64 sim, and macOS support
sdkVersion = '9.3.0.GA' // use a master build with ARM64 sim, and macOS support
npmPublish = isMaster // By default it'll do github release on master anyways too
iosLabels = 'osx && xcode-12'
}
11 changes: 10 additions & 1 deletion apidoc/Identity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -296,16 +296,22 @@ properties:
type: Number
permission: read-only
platforms: [iphone, ipad]
deprecated:
since: "10.0.0"
notes: Use <Modules.Identity.ERROR_BIOMETRY_NOT_AVAILABLE> instead.

- name: ERROR_TOUCH_ID_NOT_ENROLLED
summary: |
Constant indicating that Touch ID does not have any enrolled fingerprints.
Note: This constant has been deprecated for iOS 11 and later. Use
<Modules.Identity.ERROR_TOUCH_ID_NOT_ENROLLED for apps targeting iOS 11
<Modules.Identity.ERROR_BIOMETRY_NOT_ENROLLED for apps targeting iOS 11
and later.
type: Number
permission: read-only
platforms: [iphone, ipad]
deprecated:
since: "10.0.0"
notes: Use <Modules.Identity.ERROR_BIOMETRY_NOT_ENROLLED> instead.

- name: ERROR_SYSTEM_CANCEL
summary: |
Expand Down Expand Up @@ -348,6 +354,9 @@ properties:
type: Number
permission: read-only
platforms: [iphone, ipad, android]
deprecated:
since: "10.0.0"
notes: This constant has deprecated in iOS. Use <Modules.Identity.ERROR_BIOMETRY_LOCKOUT> instead.

- name: ERROR_BIOMETRY_LOCKOUT
summary: |
Expand Down
9 changes: 4 additions & 5 deletions ios/Classes/TiIdentityModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -233,26 +233,25 @@ - (NSDictionary *)deviceCanAuthenticate:(id)unused

#pragma mark Constants

MAKE_SYSTEM_PROP(ERROR_TOUCH_ID_LOCKOUT, LAErrorTouchIDLockout);
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ERROR_TOUCH_ID_LOCKOUT, LAErrorBiometryLockout, @"Modules.Identity.ERROR_TOUCH_ID_LOCKOUT", @"10.0.0", @"Modules.Identity.ERROR_BIOMETRY_LOCKOUT");
MAKE_SYSTEM_PROP(ERROR_INVALID_CONTEXT, LAErrorInvalidContext);
MAKE_SYSTEM_PROP(ERROR_APP_CANCELLED, LAErrorAppCancel);
MAKE_SYSTEM_PROP(ERROR_TOUCH_ID_NOT_ENROLLED, LAErrorTouchIDNotEnrolled);
MAKE_SYSTEM_PROP(ERROR_TOUCH_ID_NOT_AVAILABLE, LAErrorTouchIDNotAvailable);
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ERROR_TOUCH_ID_NOT_ENROLLED, LAErrorBiometryLockout, @"Modules.Identity.ERROR_BIOMETRY_NOT_ENROLLED", @"10.0.0", @"Modules.Identity.ERROR_BIOMETRY_NOT_ENROLLED");
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED(ERROR_TOUCH_ID_NOT_AVAILABLE, LAErrorBiometryNotAvailable, @"Modules.Identity.ERROR_TOUCH_ID_NOT_AVAILABLE", @"10.0.0", @"Modules.Identity.ERROR_BIOMETRY_NOT_AVAILABLE");

MAKE_SYSTEM_PROP(ERROR_PASSCODE_NOT_SET, LAErrorPasscodeNotSet);
MAKE_SYSTEM_PROP(ERROR_SYSTEM_CANCEL, LAErrorSystemCancel);
MAKE_SYSTEM_PROP(ERROR_USER_FALLBACK, LAErrorUserFallback);
MAKE_SYSTEM_PROP(ERROR_USER_CANCEL, LAErrorUserCancel);
MAKE_SYSTEM_PROP(ERROR_AUTHENTICATION_FAILED, LAErrorAuthenticationFailed);

#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
MAKE_SYSTEM_PROP(ERROR_BIOMETRY_NOT_AVAILABLE, LAErrorBiometryNotAvailable);
MAKE_SYSTEM_PROP(ERROR_BIOMETRY_NOT_ENROLLED, LAErrorBiometryNotEnrolled);
MAKE_SYSTEM_PROP(ERROR_BIOMETRY_LOCKOUT, LAErrorBiometryLockout);

MAKE_SYSTEM_PROP(BIOMETRY_TYPE_NONE, LABiometryNone);
MAKE_SYSTEM_PROP(BIOMETRY_TYPE_TOUCH_ID, LABiometryTypeTouchID);
MAKE_SYSTEM_PROP(BIOMETRY_TYPE_FACE_ID, LABiometryTypeFaceID);
#endif

MAKE_SYSTEM_STR(ACCESSIBLE_WHEN_UNLOCKED, kSecAttrAccessibleWhenUnlocked);
MAKE_SYSTEM_STR(ACCESSIBLE_AFTER_FIRST_UNLOCK, kSecAttrAccessibleAfterFirstUnlock);
Expand Down
4 changes: 2 additions & 2 deletions ios/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 3.0.0
version: 4.0.0
apiversion: 2
architectures: armv7 arm64 i386 x86_64
architectures: arm64 x86_64
description: titanium-identity
author: Hans Knoechel
license: Apache 2
Expand Down
8 changes: 4 additions & 4 deletions ios/titanium-identity.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
GCC_WARN_UNUSED_VALUE = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = (
"-DDEBUG",
Expand Down Expand Up @@ -323,7 +323,7 @@
GCC_WARN_UNUSED_VALUE = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "-DTI_POST_1_2";
OTHER_LDFLAGS = "-ObjC";
Expand Down Expand Up @@ -384,7 +384,7 @@
GCC_WARN_UNUSED_VALUE = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-DDEBUG",
Expand Down Expand Up @@ -447,7 +447,7 @@
GCC_WARN_UNUSED_VALUE = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
OTHER_CFLAGS = "-DTI_POST_1_2";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = ti.identity;
Expand Down
2 changes: 1 addition & 1 deletion ios/titanium.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
//
//
TITANIUM_SDK_VERSION = 9.2.2.GA
TITANIUM_SDK_VERSION = 9.3.0.GA

//
//
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@titanium-sdk/ti.identity",
"version": "5.0.0",
"version": "6.0.0",
"description": "A collection of API's to authenticate with your device: Keychain/Keystore, Touch ID and Face ID (iOS only)",
"scripts": {
"commit": "git-cz",
Expand Down