From cd1cab759d0a8f63f3193937b20d9519291302d9 Mon Sep 17 00:00:00 2001
From: Oleksandr Kalko <tsunami.wave@ukr.net>
Date: Wed, 13 Dec 2023 14:15:11 +0200
Subject: [PATCH] Android build system upgrades

* Upgrade Gradle plugin to 8.2.0
* Upgrade Gradle to 8.5
* Upgrade NDK to 26.1
* Move `buildFeatures` to Gradle build file, since using flag in
`gradle.properties` is deprecated
---
 android-project/app/build.gradle  | 5 ++++-
 android-project/gradle.properties | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
index 22f5d3948..2ab931d7d 100644
--- a/android-project/app/build.gradle
+++ b/android-project/app/build.gradle
@@ -7,7 +7,7 @@ if (buildAsApplication) {
 }
 
 android {
-	ndkVersion '26.0.10792818'
+	ndkVersion '26.1.10909125'
 	compileSdk 33
 	defaultConfig {
 		if (buildAsApplication) {
@@ -31,6 +31,9 @@ android {
 		}
 	}
 	namespace 'org.diasurgical.devilutionx'
+	buildFeatures {
+		buildConfig true
+	}
 	applicationVariants.all { variant ->
 		tasks["merge${variant.name.capitalize()}Assets"]
 			.dependsOn("externalNativeBuild${variant.name.capitalize()}")
diff --git a/android-project/gradle.properties b/android-project/gradle.properties
index 3f60deff9..9f958a0d1 100644
--- a/android-project/gradle.properties
+++ b/android-project/gradle.properties
@@ -1,3 +1,2 @@
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false