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

[minetest.git] / build / android / app / build.gradle

diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle
index 00b8806bf848f3c55dcede0b0fc3423743489568..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 '29.0.3'
-       ndkVersion '21.1.6352462'
+       buildToolsVersion '30.0.3'
+       ndkVersion '22.0.7026061'
        defaultConfig {
                applicationId 'net.minetest.minetest'
                minSdkVersion 16
@@ -11,8 +11,11 @@ android {
                versionCode project.versionCode
        }
 
+       // load properties
        Properties props = new Properties()
-       props.load(new FileInputStream(file('../local.properties')))
+       def propfile = file('../local.properties')
+       if (propfile.exists())
+               props.load(new FileInputStream(propfile))
 
        if (props.getProperty('keystore') != null) {
                signingConfigs {
@@ -57,15 +60,13 @@ task prepareAssets() {
        }
        copy {
                from "${projRoot}/doc/lgpl-2.1.txt" into "${assetsFolder}"
-               rename("lgpl-2.1.txt", "LICENSE.txt")
        }
        copy {
                from "${projRoot}/builtin" into "${assetsFolder}/builtin"
        }
-       /*copy {
-               // ToDo: fix Minetest shaders that currently don't work with OpenGL ES
+       copy {
                from "${projRoot}/client/shaders" into "${assetsFolder}/client/shaders"
-       }*/
+       }
        copy {
                from "../native/deps/Android/Irrlicht/shaders" into "${assetsFolder}/client/shaders/Irrlicht"
        }
@@ -83,6 +84,8 @@ task prepareAssets() {
                from "${projRoot}/textures" into "${assetsFolder}/textures"
        }
 
+       file("${assetsFolder}/.nomedia").text = "";
+
        task zipAssets(type: Zip) {
                archiveName "Minetest.zip"
                from "${assetsFolder}"
@@ -106,5 +109,5 @@ android.applicationVariants.all { variant ->
 
 dependencies {
        implementation project(':native')
-       implementation 'androidx.appcompat:appcompat:1.1.0'
+       implementation 'androidx.appcompat:appcompat:1.2.0'
 }