From 00660e5644203bec91fe3efb773a9f4bf64cee00 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Fri, 25 Nov 2022 15:13:27 +0700
Subject: [PATCH] TF-438 Fix build apk release android with case `jetifier
 fails on bcprov`

---
 android/build.gradle                             | 2 +-
 android/gradle.properties                        | 1 +
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 0b398e3f1..6ce9414cc 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.google.gms:google-services:4.3.10'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.2'
     }
 }
 
diff --git a/android/gradle.properties b/android/gradle.properties
index 94adc3a3f..dfa0d8d59 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.jetifier.ignorelist=bcprov-jdk15on-1.68.jar
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 1b5208f24..b8793d3c0 100644
--- 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.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip