From 78f4860bfe38f7a9643403ab31b727b49b4d4de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur@gmail.com>
Date: Mon, 30 Oct 2023 23:12:40 +0100
Subject: [PATCH] Update Android project to use more recent tools

Tested manually on my Android 13 device
---
 src/openrct2-android/app/build.gradle                        | 5 +++--
 src/openrct2-android/app/src/main/AndroidManifest.xml        | 3 +--
 src/openrct2-android/build.gradle                            | 2 +-
 .../gradle/wrapper/gradle-wrapper.properties                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/openrct2-android/app/build.gradle b/src/openrct2-android/app/build.gradle
index c70a3bde00..7364b29f41 100644
--- a/src/openrct2-android/app/build.gradle
+++ b/src/openrct2-android/app/build.gradle
@@ -2,7 +2,9 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 31
-    ndkVersion "23.1.7779620" // Latest r23b (LTS), to be synced with CI container image
+    buildToolsVersion "34.0.0"
+    ndkVersion "26.1.10909125" // Latest r26b (LTS), to be synced with CI container image
+    namespace "io.openrct2"
     defaultConfig {
         applicationId 'io.openrct2'
         minSdkVersion 19
@@ -31,7 +33,6 @@ android {
     externalNativeBuild {
         cmake {
             path 'src/main/CMakeLists.txt'
-            version "3.18.1"
         }
     }
 
diff --git a/src/openrct2-android/app/src/main/AndroidManifest.xml b/src/openrct2-android/app/src/main/AndroidManifest.xml
index 7ffba6b7de..f2b3034d05 100644
--- a/src/openrct2-android/app/src/main/AndroidManifest.xml
+++ b/src/openrct2-android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.openrct2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/src/openrct2-android/build.gradle b/src/openrct2-android/build.gradle
index 6f629c8aa7..d748ef16df 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:7.0.3'
+        classpath 'com.android.tools.build:gradle:8.3.0-alpha10'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/src/openrct2-android/gradle/wrapper/gradle-wrapper.properties b/src/openrct2-android/gradle/wrapper/gradle-wrapper.properties
index c0c37144a2..2a08360afc 100644
--- a/src/openrct2-android/gradle/wrapper/gradle-wrapper.properties
+++ b/src/openrct2-android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip