Skip to content

Commit

Permalink
Merge pull request #200 from jquick-axway/TIMOB-28509
Browse files Browse the repository at this point in the history
fix(ios): include missing i386 and armv7 architectures
  • Loading branch information
garymathews committed Jul 22, 2021
2 parents fced0ea + aeedfd7 commit 6446cfb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
9 changes: 5 additions & 4 deletions ios/Classes/TiIdentityModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -233,25 +233,26 @@ - (NSDictionary *)deviceCanAuthenticate:(id)unused

#pragma mark Constants

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_TOUCH_ID_LOCKOUT, LAErrorTouchIDLockout);
MAKE_SYSTEM_PROP(ERROR_INVALID_CONTEXT, LAErrorInvalidContext);
MAKE_SYSTEM_PROP(ERROR_APP_CANCELLED, LAErrorAppCancel);
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_TOUCH_ID_NOT_ENROLLED, LAErrorTouchIDNotEnrolled);
MAKE_SYSTEM_PROP(ERROR_TOUCH_ID_NOT_AVAILABLE, LAErrorTouchIDNotAvailable);
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: 4.0.0
version: 4.0.1
apiversion: 2
architectures: arm64 x86_64
architectures: armv7 arm64 i386 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 = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.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 = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.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 = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.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 = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
OTHER_CFLAGS = "-DTI_POST_1_2";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = ti.identity;
Expand Down
4 changes: 2 additions & 2 deletions 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": "6.0.0",
"version": "6.0.1",
"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

0 comments on commit 6446cfb

Please sign in to comment.