From c952201d976aeb522062b7129e06d1d934625a20 Mon Sep 17 00:00:00 2001
From: ne0fhyk <fhuyakou@gmail.com>
Date: Wed, 23 Jun 2021 23:49:18 -0700
Subject: [PATCH] Update config versions and deprecate the use of the jcenter
 maven repo.

(cherry picked from commit d1a9363c4c8626cd96e521b24d20ee069a4ce375)
---
 platform/android/java/app/build.gradle                      | 5 ++---
 platform/android/java/app/config.gradle                     | 4 ++--
 platform/android/java/build.gradle                          | 3 +--
 .../android/java/gradle/wrapper/gradle-wrapper.properties   | 6 +++---
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle
index ebe568b6ee8..9bf69bd59ac 100644
--- a/platform/android/java/app/build.gradle
+++ b/platform/android/java/app/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
 //CHUNK_BUILDSCRIPT_REPOSITORIES_BEGIN
 //CHUNK_BUILDSCRIPT_REPOSITORIES_END
     }
@@ -25,9 +25,8 @@ apply plugin: 'com.android.application'
 
 allprojects {
     repositories {
-        mavenCentral()
         google()
-        jcenter()
+        mavenCentral()
 //CHUNK_ALLPROJECTS_REPOSITORIES_BEGIN
 //CHUNK_ALLPROJECTS_REPOSITORIES_END
 
diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle
index a2c32552d9a..81fc87b7ef7 100644
--- a/platform/android/java/app/config.gradle
+++ b/platform/android/java/app/config.gradle
@@ -1,11 +1,11 @@
 ext.versions = [
-    androidGradlePlugin: '4.0.1',
+    androidGradlePlugin: '4.2.1',
     compileSdk         : 29,
     minSdk             : 18,
     targetSdk          : 29,
     buildTools         : '30.0.3',
     supportCoreUtils   : '1.0.0',
-    kotlinVersion      : '1.4.10',
+    kotlinVersion      : '1.5.10',
     v4Support          : '1.0.0',
     javaVersion        : 1.8,
     ndkVersion         : '21.4.7075529' // Also update 'platform/android/detect.py#get_project_ndk_version()' when this is updated.
diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle
index a28888d80d3..ee24a46d9fb 100644
--- a/platform/android/java/build.gradle
+++ b/platform/android/java/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath libraries.androidGradlePlugin
@@ -16,7 +16,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
 }
diff --git a/platform/android/java/gradle/wrapper/gradle-wrapper.properties b/platform/android/java/gradle/wrapper/gradle-wrapper.properties
index a7d8a0f3107..74c5636f8ac 100644
--- a/platform/android/java/gradle/wrapper/gradle-wrapper.properties
+++ b/platform/android/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 02 02:44:30 PDT 2019
+#Wed Jun 23 23:42:22 PDT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME