Merge pull request #3 from getyoti/YD-2051

[YD-2051] Update Android dependencies to 2.2.0 & iOS to 2.1.1

Author: mariasenosiain

README.md

@@ -60,6 +60,20 @@ allprojects {
     }
     ...
 }
+```
+### Debug build configuration
+
+Add this configuration for the debug build type to your `buildTypes` block (`android/app/build.gradle`):
+
+```diff
+buildTypes {
+    debug {
++     matchingFallbacks = ['release']
+      ...
+    }
+    ...
+}
+
 ```
 
 Depending on your Android project setup and version of React Native, you

android/build.gradle

@@ -5,19 +5,25 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 28)
-    buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
+    compileSdkVersion safeExtGet('compileSdkVersion', 29)
+    buildToolsVersion safeExtGet('buildToolsVersion', '29.0.3')
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 28)
-        versionCode 1
-        versionName "1.0.0"
+        minSdkVersion safeExtGet('minSdkVersion', 21)
+        targetSdkVersion safeExtGet('targetSdkVersion', 29)
+        versionCode 110
+        versionName "1.1.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
     }
 
+    buildTypes {    
+        debug {
+            matchingFallbacks = ['release']
+        }
+    }
+
     packagingOptions {
         exclude 'META-INF/*.kotlin_module'
         exclude "**/kotlin/**"
@@ -27,15 +33,13 @@ android {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
     }
-
-
 }
 
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan:2.1.0'
-    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-liveness-zoom:2.1.0'
+    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan:2.2.0'
+    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-liveness-zoom:2.2.0'
 }
 
 allprojects {

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-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip

example/.gitignore

@@ -57,3 +57,4 @@ buck-out/
 
 # CocoaPods
 /ios/Pods/
+Podfile.lock

example/android/app/build.gradle

@@ -131,8 +131,8 @@ android {
         applicationId "com.example"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode 110
+        versionName "1.1.0"
     }
     splits {
         abi {
@@ -152,6 +152,7 @@ android {
     }
     buildTypes {
         debug {
+            matchingFallbacks = ['release']
             signingConfig signingConfigs.debug
         }
         release {
@@ -184,6 +185,8 @@ android {
         pickFirst 'lib/arm64-v8a/libc++_shared.so'
         pickFirst 'lib/x86_64/libc++_shared.so'
         pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+        exclude 'META-INF/*.kotlin_module'
+        exclude "**/kotlin/**"
     }
 }
 

example/android/build.gradle

@@ -2,17 +2,17 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "28.0.3"
+        buildToolsVersion = "29.0.3"
         minSdkVersion = 21
-        compileSdkVersion = 28
-        targetSdkVersion = 28
+        compileSdkVersion = 29
+        targetSdkVersion = 29
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.2")
+        classpath("com.android.tools.build:gradle:3.6.2")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

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-5.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/android/settings.gradle

@@ -1,3 +1,4 @@
 rootProject.name = 'example'
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
+apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle") 
+applyNativeModulesSettingsGradle(settings)
 include ':app'

example/ios/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '11.0'
+platform :ios, '11.4'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
 target 'example' do