Android: update gradle, NDK and built tools version

Maksim · rubenwardy · commit 2ca81d679f92 · 2020-10-13T20:28:31.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ buildscript {`
`15`	`15`	`jcenter()`
`16`	`16`	`}`
`17`	`17`	`dependencies {`
`18`		`- classpath 'com.android.tools.build:gradle:4.0.0'`
`19`		`- classpath 'de.undercouch:gradle-download-task:4.0.4'`
	`18`	`+ classpath 'com.android.tools.build:gradle:4.0.1'`
	`19`	`+ classpath 'de.undercouch:gradle-download-task:4.1.1'`
`20`	`20`	`// NOTE: Do not place your application dependencies here; they belong`
`21`	`21`	`// in the individual module build.gradle files`
`22`	`22`	`}`