From 5c00047bd15d14ff19853406972809c0ec6f50a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur@gmail.com>
Date: Mon, 11 Mar 2024 20:59:03 +0100
Subject: [PATCH] Sync android project with docker build image

---
 src/openrct2-android/app/build.gradle  | 4 ++--
 src/openrct2-android/build.gradle      | 2 +-
 src/openrct2-android/gradle.properties | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/openrct2-android/app/build.gradle b/src/openrct2-android/app/build.gradle
index 5e8073f5e1..fbd7d4b853 100644
--- a/src/openrct2-android/app/build.gradle
+++ b/src/openrct2-android/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdk 34
     buildToolsVersion "34.0.0"
     ndkVersion "26.2.11394342" // Latest r26c (LTS), to be synced with CI container image
     namespace "io.openrct2"
     defaultConfig {
         applicationId 'io.openrct2'
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 28
 
         versionCode 2
diff --git a/src/openrct2-android/build.gradle b/src/openrct2-android/build.gradle
index d748ef16df..01f316eecb 100644
--- a/src/openrct2-android/build.gradle
+++ b/src/openrct2-android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.0-alpha10'
+        classpath 'com.android.tools.build:gradle:8.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/src/openrct2-android/gradle.properties b/src/openrct2-android/gradle.properties
index fa2c20f971..e37f08064c 100644
--- a/src/openrct2-android/gradle.properties
+++ b/src/openrct2-android/gradle.properties
@@ -16,6 +16,7 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.enableJetifier=true
+android.enableJetifier=false
 android.useAndroidX=true
+org.gradle.configuration-cache=true
 org.gradle.jvmargs=-Xmx4096m