From 2ca81d679f92ff1f0effccff5d3ee5672871324f Mon Sep 17 00:00:00 2001
From: Maksim <MoNTE48@mail.ua>
Date: Mon, 7 Sep 2020 22:12:31 +0200
Subject: [PATCH] Android: update gradle, NDK and built tools version

---
 build/android/app/build.gradle                         | 6 +++---
 build/android/build.gradle                             | 4 ++--
 build/android/gradle/wrapper/gradle-wrapper.properties | 8 ++++++--
 build/android/native/build.gradle                      | 4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle
index 2c0a02b7f..812726030 100644
--- a/build/android/app/build.gradle
+++ b/build/android/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 android {
 	compileSdkVersion 29
-	buildToolsVersion '29.0.3'
-	ndkVersion '21.2.6472646'
+	buildToolsVersion '30.0.2'
+	ndkVersion '21.3.6528147'
 	defaultConfig {
 		applicationId 'net.minetest.minetest'
 		minSdkVersion 16
@@ -110,5 +110,5 @@ android.applicationVariants.all { variant ->
 
 dependencies {
 	implementation project(':native')
-	implementation 'androidx.appcompat:appcompat:1.1.0'
+	implementation 'androidx.appcompat:appcompat:1.2.0'
 }
diff --git a/build/android/build.gradle b/build/android/build.gradle
index 4cde1c3d6..111a506e1 100644
--- a/build/android/build.gradle
+++ b/build/android/build.gradle
@@ -15,8 +15,8 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.0.0'
-		classpath 'de.undercouch:gradle-download-task:4.0.4'
+		classpath 'com.android.tools.build:gradle:4.0.1'
+		classpath 'de.undercouch:gradle-download-task:4.1.1'
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
 	}
diff --git a/build/android/gradle/wrapper/gradle-wrapper.properties b/build/android/gradle/wrapper/gradle-wrapper.properties
index 59a00ebac..ed85703f3 100644
--- a/build/android/gradle/wrapper/gradle-wrapper.properties
+++ b/build/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,2 +1,6 @@
-#Fri Jun 05 19:18:07 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+#Mon Sep 07 22:11:10 CEST 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
diff --git a/build/android/native/build.gradle b/build/android/native/build.gradle
index b072766b0..69e1cf461 100644
--- a/build/android/native/build.gradle
+++ b/build/android/native/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'de.undercouch.download'
 
 android {
 	compileSdkVersion 29
-	buildToolsVersion '29.0.3'
-	ndkVersion '21.2.6472646'
+	buildToolsVersion '30.0.2'
+	ndkVersion '21.3.6528147'
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29