Android: Increase target/compiled SDK version to 32 (#12911)

Build Tools, NDK, and Gradle are also updated.
Repositories is changed from jcenter() to mavenCentral().

diff --git a/android/app/build.gradle b/android/app/build.gradle
index ce895edd17acbe96076e5c7311a2851cc28a856d..407767249bd79993fff35d4a809487af5240d308 100644 (file)
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 android {
-       compileSdkVersion 30
-       buildToolsVersion '30.0.3'
+       compileSdkVersion 32
+       buildToolsVersion '32.0.0'
        ndkVersion "$ndk_version"
        defaultConfig {
                applicationId 'net.minetest.minetest'
                minSdkVersion 16
-               targetSdkVersion 30
+               targetSdkVersion 32
                versionName "${versionMajor}.${versionMinor}.${versionPatch}"
                versionCode project.versionCode
        }
@@ -87,12 +87,12 @@ task prepareAssets() {
                from "${projRoot}/textures" into "${assetsFolder}/textures"
        }
 
-       file("${assetsFolder}/.nomedia").text = "";
+       file("${assetsFolder}/.nomedia").text = ""
 
        task zipAssets(type: Zip) {
-               archiveName "Minetest.zip"
+               archiveFileName = "Minetest.zip"
                from "${assetsFolder}"
-               destinationDir file("src/main/assets")
+               destinationDirectory = file("src/main/assets")
        }
 }
 
@@ -112,5 +112,5 @@ android.applicationVariants.all { variant ->
 
 dependencies {
        implementation project(':native')
-       implementation 'androidx.appcompat:appcompat:1.3.1'
+       implementation 'androidx.appcompat:appcompat:1.5.1'
 }

diff --git a/android/build.gradle b/android/build.gradle
index 8f3b90e7fe176541c02f7f14883c23b036e2f203..e4afab73dcf85d241c497e176bc387ee0ea0ce46 100644 (file)
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -11,13 +11,13 @@ project.ext.set("developmentBuild", 1) // Whether it is a development build, or
 // each APK must have a larger `versionCode` than the previous
 
 buildscript {
-       ext.ndk_version = '23.2.8568313'
+       ext.ndk_version = '25.1.8937393'
        repositories {
                google()
-               jcenter()
+               mavenCentral()
        }
        dependencies {
-               classpath 'com.android.tools.build:gradle:7.0.3'
+               classpath 'com.android.tools.build:gradle:7.2.2'
                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
@@ -27,7 +27,7 @@ buildscript {
 allprojects {
        repositories {
                google()
-               jcenter()
+               mavenCentral()
        }
 }
 

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 8ad73a75c039a1402b6ac795df1089118f38c4a7..6b7fd26c83d7bfd70de2e72914e6f9e0d9726906 100644 (file)
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

diff --git a/android/native/build.gradle b/android/native/build.gradle
index 90e4fe2e77e9749af1fbfb560640bcba7cd1595d..dc923bf3dba9efaa9adee356a03eab534957dada 100644 (file)
--- a/android/native/build.gradle
+++ b/android/native/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'de.undercouch.download'
 
 android {
-       compileSdkVersion 30
-       buildToolsVersion '30.0.3'
+       compileSdkVersion 32
+       buildToolsVersion '32.0.0'
        ndkVersion "$ndk_version"
        defaultConfig {
                minSdkVersion 16
-               targetSdkVersion 30
+               targetSdkVersion 32
                externalNativeBuild {
                        ndkBuild {
                                arguments '-j' + Runtime.getRuntime().availableProcessors(),