Merge pull request #39 from getyoti/release/DEP-459-3.0.0

mariasenosiain · web-flow · commit d2361d253d49 · 2024-05-01T16:44:57.000+01:00
[Task] DEP-459: RN 3.0.0
diff --git a/README.md b/README.md
@@ -11,13 +11,13 @@ To integrate with Yoti IDV, a working infrastructure is needed (see [developers.
 
 ## Requirements
 - [Android SDK 3+](https://github.com/getyoti/yoti-doc-scan-android/releases)
-- [iOS SDK 4+](https://github.com/getyoti/yoti-doc-scan-ios/releases)
+- [iOS SDK 5+](https://github.com/getyoti/yoti-doc-scan-ios/releases)
 
 ## Integration
 Start your integration by adding the following dependency to your `package.json` file:
 ```json
 "dependencies": {
-    "@getyoti/yoti-doc-scan-react-native": "^2.0.2"
+    "@getyoti/yoti-doc-scan-react-native": "^3.0.0"
 }
 ```
 
@@ -26,7 +26,7 @@ Continuing with your integration for Android, add the following property and rep
 ```groovy
 buildscript {
     ext {
-        yotiSdkVersion = "3.2.2"
+        yotiSdkVersion = "3.3.0"
     }
 }
 allprojects {
@@ -70,6 +70,8 @@ target 'TargetName' do
   use_react_native!(:path => config[:reactNativePath])
   use_frameworks!
   use_native_modules!
+  pod 'YotiDocumentScan'                // Include if `YotiSDKIdentityDocument` is included and to support identity document OCR
+  pod 'YotiNFC'                         // Include if `YotiSDKIdentityDocument` is included and to support identity document NFC
   pod 'YotiSDKIdentityDocument'         // Optional
   pod 'YotiSDKSupplementaryDocument'    // Optional
   pod 'YotiSDKFaceTec'                  // Optional
@@ -78,7 +80,7 @@ end
 ```
 In addition, you should add [`NSCameraUsageDescription`](https://developer.apple.com/documentation/bundleresources/information_property_list/nscamerausagedescription) to your `Info.plist`.
 
-And if you have included `YotiSDKIdentityDocument` in your target, make sure to also:
+And if you have included `YotiNFC` in your target, make sure to also:
 - Add [`NFCReaderUsageDescription`](https://developer.apple.com/documentation/bundleresources/information_property_list/nfcreaderusagedescription) to your `Info.plist`
 - Add [`com.apple.developer.nfc.readersession.iso7816.select-identifiers`](https://developer.apple.com/documentation/bundleresources/information_property_list/select-identifiers) to your `Info.plist` and include [`A0000002471001`](https://www.icao.int/publications/Documents/9303_p10_cons_en.pdf) as an application identifier for your app to support
 - Turn on [`Near Field Communication Tag Reading`](https://developer.apple.com/documentation/corenfc/building_an_nfc_tag-reader_app) under the Signing & Capabilities tab for your project’s target
@@ -134,11 +136,12 @@ Code | Description
 2000 | Unauthorised request (wrong or expired session token)
 2001 | Session not found
 2002 | Session expired
-2003 | SDK launched without session Token
-2004 | SDK launched without session ID
+2003 | SDK launched without a session token
+2004 | SDK launched without a session id
 3000 | Yoti's services are down or unable to process the request
 3001 | An error occurred during a network request
 3002 | The user did not have a network connection
+3003 | A network request timed out
 4000 | The user did not grant permission to the camera
 4001 | The user submitted a wrong document
 5000 | The user's camera was not found and file upload is not allowed
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,14 +5,13 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 29)
-    buildToolsVersion safeExtGet('buildToolsVersion', '29.0.3')
+    compileSdk safeExtGet('compileSdkVersion', 33)
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 29)
-        versionCode 206
-        versionName "2.0.2"
+        targetSdkVersion safeExtGet('targetSdkVersion', 33)
+        versionCode 300
+        versionName "3.0.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -93,15 +93,15 @@ dependencies {
 }
 
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
 
 configurations.all {
     resolutionStrategy {
-        force 'androidx.core:core:1.6.0'
-        force 'androidx.core:core-ktx:1.6.0'
+        force 'androidx.core:core:1.8.0'
+        force 'androidx.core:core-ktx:1.8.0'
     }
 }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
+        android:exported="true"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
         android:windowSoftInputMode="adjustResize">
         <intent-filter>
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,17 +1,16 @@
 buildscript {
     ext {
-        buildToolsVersion = "29.0.3"
         minSdkVersion = 21
-        compileSdkVersion = 29
-        targetSdkVersion = 29
-        yotiSdkVersion = "3.2.2"
+        compileSdkVersion = 33
+        targetSdkVersion = 33
+        yotiSdkVersion = "3.3.0"
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.6.2")
+        classpath('com.android.tools.build:gradle:7.4.2')
     }
 }
 
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -205,7 +205,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Demo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -241,7 +241,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Demo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -312,7 +312,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -360,7 +360,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -8,6 +8,8 @@ target 'Demo' do
   use_react_native!(:path => config[:reactNativePath])
   use_frameworks!
   use_native_modules!
+  pod 'YotiDocumentScan'
+  pod 'YotiNFC'
   pod 'YotiSDKIdentityDocument'
   pod 'YotiSDKFaceTec'
 end
diff --git a/ios/RNYotiDocScan.m b/ios/RNYotiDocScan.m
@@ -1,7 +1,5 @@
 #import "RNYotiDocScan.h"
 #import <React/RCTUtils.h>
-#import <YotiSDKNetwork/YotiSDKNetwork-Swift.h>
-#import <YotiSDKCommon/YotiSDKCommon-Swift.h>
 #import <YotiSDKCore/YotiSDKCore-Swift.h>
 #if __has_include(<YotiSDKIdentityDocument/YotiSDKIdentityDocument-Swift.h>)
 #import <YotiSDKIdentityDocument/YotiSDKIdentityDocument-Swift.h>
diff --git a/ios/RNYotiDocScan.xcodeproj/project.pbxproj b/ios/RNYotiDocScan.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -148,7 +148,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -201,7 +201,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "license": "https://www.yoti.com/terms/identity-verification",
     "author": "Yoti Ltd",
     "main": "RNYotiDocScan.js",
-    "version": "2.0.2",
+    "version": "3.0.0",
     "devDependencies": {
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
diff --git a/yoti-doc-scan-react-native.podspec b/yoti-doc-scan-react-native.podspec
@@ -23,7 +23,5 @@ Pod::Spec.new do |spec|
   spec.source_files = "ios/**/*.{h,m}"
   spec.platform = :ios, "11.0"
   spec.dependency "React"
-  spec.dependency "YotiSDKNetwork"
-  spec.dependency "YotiSDKCommon"
   spec.dependency "YotiSDKCore"
 end

Original file line number	Diff line number	Diff line change
`@@ -93,15 +93,15 @@ dependencies {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`task copyDownloadableDepsToLibs(type: Copy) {`
`96`		`- from configurations.compile`
	`96`	`+ from configurations.implementation`
`97`	`97`	`into 'libs'`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)`
`101`	`101`
`102`	`102`	`configurations.all {`
`103`	`103`	`resolutionStrategy {`
`104`		`- force 'androidx.core:core:1.6.0'`
`105`		`- force 'androidx.core:core-ktx:1.6.0'`
	`104`	`+ force 'androidx.core:core:1.8.0'`
	`105`	`+ force 'androidx.core:core-ktx:1.8.0'`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,16 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext {`
`3`		`- buildToolsVersion = "29.0.3"`
`4`	`3`	`minSdkVersion = 21`
`5`		`- compileSdkVersion = 29`
`6`		`- targetSdkVersion = 29`
`7`		`- yotiSdkVersion = "3.2.2"`
	`4`	`+ compileSdkVersion = 33`
	`5`	`+ targetSdkVersion = 33`
	`6`	`+ yotiSdkVersion = "3.3.0"`
`8`	`7`	`}`
`9`	`8`	`repositories {`
`10`	`9`	`google()`
`11`	`10`	`jcenter()`
`12`	`11`	`}`
`13`	`12`	`dependencies {`
`14`		`- classpath("com.android.tools.build:gradle:3.6.2")`
	`13`	`+ classpath('com.android.tools.build:gradle:7.4.2')`
`15`	`14`	`}`
`16`	`15`	`}`
`17`	`16`