Skip to content

Commit

Permalink
Final commit for 3.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
JumioMobileTeam committed Dec 13, 2019
1 parent 3d86be8 commit 804ea43
Show file tree
Hide file tree
Showing 13 changed files with 6,307 additions and 7,073 deletions.
43 changes: 37 additions & 6 deletions DemoApp/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,15 @@ import com.android.build.OutputFile
*/

project.ext.react = [
entryFile: "index.js"
entryFile: "index.js",
enableHermes: false
]

apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle")
applyNativeModulesAppBuildGradle(project)
apply from: "../../node_modules/react-native/react.gradle"


/**
* Set this to true to create two separate APKs instead of one:
* - An APK that only works on ARM devices
Expand All @@ -94,12 +98,12 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false

android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 29
buildToolsVersion '29.0.0'
defaultConfig {
applicationId "com.demoapp"
minSdkVersion 19
targetSdkVersion 28
targetSdkVersion 29
versionCode 1
versionName "1.0"
ndk {
Expand Down Expand Up @@ -144,12 +148,39 @@ repositories {
jcenter()
maven { url 'https://maven.google.com/' }
maven { url 'http://mobile-sdk.jumio.com' }
// Android JSC is installed from npm
maven {
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}
}

def jscFlavor = 'org.webkit:android-jsc:+'

def enableHermes = project.ext.react.get("enableHermes", false);


dependencies {
api project(':react-native-jumio-mobilesdk')
implementation project(':react-native-jumio-mobilesdk')
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.facebook.react:react-native:+'
implementation "com.facebook.react:react-native:+" // From node_modules

if (enableHermes) {
// for RN 0.61+
def hermesPath = "../../node_modules/hermes-engine/android/";


debugImplementation files(hermesPath + "hermes-debug.aar")
releaseImplementation files(hermesPath + "hermes-release.aar")
} else {
implementation jscFlavor
}
implementation "com.google.android.gms:play-services-vision:19.0.0"
//implementation 'com.google.android.gms:play-services:12.0.1'
// implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
// implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
// implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"

// From node_modules
}

Expand Down
15 changes: 10 additions & 5 deletions DemoApp/android/app/src/main/java/com/demoapp/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
import android.app.Application;

import com.facebook.react.ReactApplication;
import com.jumio.react.JumioPackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
import com.facebook.soloader.SoLoader;
import com.jumio.react.BuildConfig;
import com.jumio.react.JumioPackage;
import android.util.Log;
import com.facebook.react.PackageList;
import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
import com.facebook.react.bridge.JavaScriptExecutorFactory;

import java.util.Arrays;
import java.util.List;
Expand All @@ -24,10 +28,11 @@ public boolean getUseDeveloperSupport() {

@Override
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new JumioPackage()
);
@SuppressWarnings("UnnecessaryLocalVariable")
List<ReactPackage> packages = new PackageList(this).getPackages();
// Packages that cannot be autolinked yet can be added manually here, for example:
packages.add(new JumioPackage());
return packages;
}

@Override
Expand Down
41 changes: 24 additions & 17 deletions DemoApp/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,36 +1,43 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext {
buildToolsVersion = "29.0.0"
minSdkVersion = 19
compileSdkVersion = 29
targetSdkVersion = 29
}
repositories {
google()
jcenter()
maven { url 'https://maven.google.com/' }
google()
}
maven { url 'http://mobile-sdk.jumio.com' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.0'

classpath("com.android.tools.build:gradle:3.5.2")
// classpath("com.google.gms:google-services:4.2.0")
classpath("com.google.android.gms:play-services-vision:19.0.0")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

allprojects {
repositories {
maven {
url 'https://maven.google.com'
}
mavenLocal()
jcenter()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android"
url("$rootDir/../node_modules/react-native/android")
}
}


configurations.all {
resolutionStrategy.eachDependency {DependencyResolveDetails details ->
if (details.requested.group.contains('androidx') && details.requested.version == '1.0.0-rc01') {
details.useVersion "1.0.0"
details.because 'Final version should be used'
}
maven {
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}

google()
jcenter()
maven { url 'https://jitpack.io' }
}
}
}
3 changes: 1 addition & 2 deletions DemoApp/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Tue Feb 26 14:31:12 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
3 changes: 3 additions & 0 deletions DemoApp/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
rootProject.name = 'DemoApp'
include ':react-native-jumio-mobilesdk'
project(':react-native-jumio-mobilesdk').projectDir = new File(rootProject.projectDir, '../../android')
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':react-native-jumio-mobilesdk'
project(':react-native-jumio-mobilesdk').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-jumio-mobilesdk/android')

include ':app'
94 changes: 56 additions & 38 deletions DemoApp/ios/DemoApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,16 @@
objects = {

/* Begin PBXBuildFile section */
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
1C5971F0ED8C6F3652ADA47D /* Pods_DemoApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A43960EE14DD9E429B124B93 /* Pods_DemoApp.framework */; };
5416DA4020775C6C0059290D /* JumioMobileSDKBamCheckout.m in Sources */ = {isa = PBXBuildFile; fileRef = 5416DA1120775C6B0059290D /* JumioMobileSDKBamCheckout.m */; };
5416DA4120775C6C0059290D /* JumioMobileSDKDocumentVerification.m in Sources */ = {isa = PBXBuildFile; fileRef = 5416DA3C20775C6B0059290D /* JumioMobileSDKDocumentVerification.m */; };
5416DA4220775C6C0059290D /* JumioMobileSDKNetverify.m in Sources */ = {isa = PBXBuildFile; fileRef = 5416DA3E20775C6B0059290D /* JumioMobileSDKNetverify.m */; };
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
96673C9922662D4200EE3C95 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96673C6B22662D4200EE3C95 /* JavaScriptCore.framework */; };
9676A038225E3FFD00763306 /* JumioMobileSDKAuthentication.m in Sources */ = {isa = PBXBuildFile; fileRef = 9676A037225E3FFD00763306 /* JumioMobileSDKAuthentication.m */; };
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -334,19 +322,6 @@
buildActionMask = 2147483647;
files = (
96673C9922662D4200EE3C95 /* JavaScriptCore.framework in Frameworks */,
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
146834051AC3E58100842450 /* libReact.a in Frameworks */,
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
1C5971F0ED8C6F3652ADA47D /* Pods_DemoApp.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -589,7 +564,6 @@
ORGANIZATIONNAME = Facebook;
TargetAttributes = {
13B07F861A680F5B00A75B9A = {
DevelopmentTeam = JC7JKY534B;
ProvisioningStyle = Manual;
};
};
Expand All @@ -599,6 +573,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -957,28 +932,72 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-DemoApp/Pods-DemoApp-frameworks.sh",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.1.0/JumioCore.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.1.0/BAMCheckout.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.1.0/Netverify.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.1.0/NetverifyBarcode.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.1.0/MicroBlink.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.1.0/NetverifyFace.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.1.0/ZoomAuthenticationHybrid.framework",
"${PODS_ROOT}/Target Support Files/Pods-DemoApp/Pods-DemoApp-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework",
"${BUILT_PRODUCTS_DIR}/FBReactNativeSpec/FBReactNativeSpec.framework",
"${BUILT_PRODUCTS_DIR}/Folly/folly.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.4.2/JumioCore.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.4.2/BAMCheckout.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.4.2/Netverify.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.4.2/NetverifyBarcode.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.4.2/MicroBlink.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.4.2/NetverifyFace.framework",
"${PODS_ROOT}/JumioMobileSDK/JumioMobileSDK-3.4.2/ZoomAuthenticationHybrid.framework",
"${BUILT_PRODUCTS_DIR}/RCTTypeSafety/RCTTypeSafety.framework",
"${BUILT_PRODUCTS_DIR}/React-Core/React.framework",
"${BUILT_PRODUCTS_DIR}/React-CoreModules/CoreModules.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTActionSheet/RCTActionSheet.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTAnimation/RCTAnimation.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTBlob/RCTBlob.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTImage/RCTImage.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTLinking/RCTLinking.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTNetwork/RCTNetwork.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTSettings/RCTSettings.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTText/RCTText.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTVibration/RCTVibration.framework",
"${BUILT_PRODUCTS_DIR}/React-cxxreact/cxxreact.framework",
"${BUILT_PRODUCTS_DIR}/React-jsi/jsi.framework",
"${BUILT_PRODUCTS_DIR}/React-jsiexecutor/jsireact.framework",
"${BUILT_PRODUCTS_DIR}/React-jsinspector/jsinspector.framework",
"${BUILT_PRODUCTS_DIR}/ReactCommon/ReactCommon.framework",
"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
"${BUILT_PRODUCTS_DIR}/glog/glog.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBReactNativeSpec.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JumioCore.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BAMCheckout.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Netverify.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NetverifyBarcode.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MicroBlink.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NetverifyFace.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZoomAuthenticationHybrid.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTTypeSafety.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CoreModules.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTActionSheet.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTAnimation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTBlob.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTImage.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTLinking.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTNetwork.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTSettings.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTText.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTVibration.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cxxreact.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsi.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsireact.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsinspector.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactCommon.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoApp/Pods-DemoApp-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DemoApp/Pods-DemoApp-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
B74DA3C783A9348EEF2F21F1 /* [CP] Check Pods Manifest.lock */ = {
Expand Down Expand Up @@ -1035,10 +1054,10 @@
baseConfigurationReference = AAA0AFEE17514565D7769F8E /* Pods-DemoApp.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = JC7JKY534B;
INFOPLIST_FILE = DemoApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -1049,8 +1068,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "com.jumio.react-demo";
PRODUCT_NAME = DemoApp;
PROVISIONING_PROFILE = "296fa93e-6071-4ac3-93b0-1a445fe86a6e";
PROVISIONING_PROFILE_SPECIFIER = JumioDevelopmentEnterprise;
PROVISIONING_PROFILE_SPECIFIER = "";
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
Expand Down
Loading

0 comments on commit 804ea43

Please sign in to comment.