Android: Increase minimum SDK version to 21

Target/compiled SDK version is increased to 33.
Build Tools, NDK, and Gradle are also updated.

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 407767249bd79993fff35d4a809487af5240d308..0c7884e7207bac9a1e91b006e544d5b77114c648 100644 (file)
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,12 +1,13 @@
 apply plugin: 'com.android.application'
+
 android {
-       compileSdkVersion 32
-       buildToolsVersion '32.0.0'
+       compileSdkVersion 33
+       buildToolsVersion '33.0.2'
        ndkVersion "$ndk_version"
        defaultConfig {
                applicationId 'net.minetest.minetest'
-               minSdkVersion 16
-               targetSdkVersion 32
+               minSdkVersion 21
+               targetSdkVersion 33
                versionName "${versionMajor}.${versionMinor}.${versionPatch}"
                versionCode project.versionCode
        }
@@ -112,5 +113,5 @@ android.applicationVariants.all { variant ->
 
 dependencies {
        implementation project(':native')
-       implementation 'androidx.appcompat:appcompat:1.5.1'
+       implementation 'androidx.appcompat:appcompat:1.6.1'
 }

diff --git a/android/build.gradle b/android/build.gradle
index e4afab73dcf85d241c497e176bc387ee0ea0ce46..cbe01c56fa8c7f2abb9a655a855b480f9e9794b2 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 = '25.1.8937393'
+       ext.ndk_version = '25.2.9519653'
        repositories {
                google()
                mavenCentral()
        }
        dependencies {
-               classpath 'com.android.tools.build:gradle:7.2.2'
+               classpath 'com.android.tools.build:gradle:7.4.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/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 6b7fd26c83d7bfd70de2e72914e6f9e0d9726906..0e9a610516bd503d48f0037a546ae2c3dd63c636 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.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip

diff --git a/android/native/build.gradle b/android/native/build.gradle
index dc923bf3dba9efaa9adee356a03eab534957dada..6caec137971d8378af209533f3204868ea291676 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 32
-       buildToolsVersion '32.0.0'
+       compileSdkVersion 33
+       buildToolsVersion '33.0.2'
        ndkVersion "$ndk_version"
        defaultConfig {
-               minSdkVersion 16
-               targetSdkVersion 32
+               minSdkVersion 21
+               targetSdkVersion 33
                externalNativeBuild {
                        ndkBuild {
                                arguments '-j' + Runtime.getRuntime().availableProcessors(),