Android: Update Gradle, NDK, Build Tools, and SQLite version (#10833)

diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle
index fccb7b3b4a923c76653b8224758b0307d70386fd..7f4eba8c43bb9e18c658caf7597ee77f6d0f90cf 100644 (file)
--- 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 '30.0.2'
-       ndkVersion '21.3.6528147'
+       buildToolsVersion '30.0.3'
+       ndkVersion '22.0.7026061'
        defaultConfig {
                applicationId 'net.minetest.minetest'
                minSdkVersion 16

diff --git a/build/android/build.gradle b/build/android/build.gradle
index 6091ff0bc84954313813a9942547c76d71c9aefd..61b24caabf3833c6ec7dc07e04b8a807c76da8a0 100644 (file)
--- a/build/android/build.gradle
+++ b/build/android/build.gradle
@@ -15,7 +15,7 @@ buildscript {
                jcenter()
        }
        dependencies {
-               classpath 'com.android.tools.build:gradle:4.0.1'
+               classpath 'com.android.tools.build:gradle:4.1.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 ed85703f355007bebe2cd0b4a271a92322c367e8..7fd9307d730679c6fab651833fa3b694d6353ffc 100644 (file)
--- a/build/android/gradle/wrapper/gradle-wrapper.properties
+++ b/build/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 07 22:11:10 CEST 2020
+#Fri Jan 08 17:52:00 UTC 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
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip

diff --git a/build/android/native/build.gradle b/build/android/native/build.gradle
index 69e1cf461cdad5b9deb0eef92fa07c51348b2e7b..8ea6347b35a9c84df66c7a85a78e73c79acf3c3b 100644 (file)
--- 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 '30.0.2'
-       ndkVersion '21.3.6528147'
+       buildToolsVersion '30.0.3'
+       ndkVersion '22.0.7026061'
        defaultConfig {
                minSdkVersion 16
                targetSdkVersion 29
@@ -71,7 +71,7 @@ task getDeps(dependsOn: downloadDeps, type: Copy) {
 }
 
 // get sqlite
-def sqlite_ver = '3320200'
+def sqlite_ver = '3340000'
 task downloadSqlite(dependsOn: getDeps, type: Download) {
        src 'https://www.sqlite.org/2020/sqlite-amalgamation-' + sqlite_ver + '.zip'
        dest new File(buildDir, 'sqlite.zip')