From c1e430ef68271b8769ae8852b2b4a2fa0fb7ccac Mon Sep 17 00:00:00 2001
From: Muhammad Rifqi Priyo Susanto <muhammadrifqipriyosusanto@gmail.com>
Date: Sat, 18 Feb 2023 06:03:28 +0700
Subject: [PATCH] Android: Increase minimum SDK version to 21

Target/compiled SDK version is increased to 33.
Build Tools, NDK, and Gradle are also updated.
---
 android/app/build.gradle                         | 11 ++++++-----
 android/build.gradle                             |  4 ++--
 android/gradle/wrapper/gradle-wrapper.properties |  2 +-
 android/native/build.gradle                      |  8 ++++----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 407767249..0c7884e72 100644
--- 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 e4afab73d..cbe01c56f 100644
--- 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 6b7fd26c8..0e9a61051 100644
--- 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 dc923bf3d..6caec1379 100644
--- 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(),