From ae27d51dc68381eac5162f58990813d68f38c350 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sun, 10 Sep 2023 14:53:58 +0200
Subject: [PATCH] Fix building for Android with the latest Java version (update
 to Gradle `8.3`)

---
 Source/Platforms/Android/Binaries/Project/app/build.gradle     | 1 +
 Source/Platforms/Android/Binaries/Project/build.gradle         | 2 +-
 Source/Platforms/Android/Binaries/Project/gradle.properties    | 3 +--
 .../Binaries/Project/gradle/wrapper/gradle-wrapper.properties  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Platforms/Android/Binaries/Project/app/build.gradle b/Source/Platforms/Android/Binaries/Project/app/build.gradle
index 0ad5776b5..2f5da0a56 100644
--- a/Source/Platforms/Android/Binaries/Project/app/build.gradle
+++ b/Source/Platforms/Android/Binaries/Project/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 android {
     compileSdkVersion 24
+    namespace "${PackageName}"
     defaultConfig {
         applicationId "${PackageName}"
         minSdkVersion 24
diff --git a/Source/Platforms/Android/Binaries/Project/build.gradle b/Source/Platforms/Android/Binaries/Project/build.gradle
index 31d9237bc..ff4610757 100644
--- a/Source/Platforms/Android/Binaries/Project/build.gradle
+++ b/Source/Platforms/Android/Binaries/Project/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/Source/Platforms/Android/Binaries/Project/gradle.properties b/Source/Platforms/Android/Binaries/Project/gradle.properties
index 7be81848a..f38a936bd 100644
--- a/Source/Platforms/Android/Binaries/Project/gradle.properties
+++ b/Source/Platforms/Android/Binaries/Project/gradle.properties
@@ -9,5 +9,4 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
diff --git a/Source/Platforms/Android/Binaries/Project/gradle/wrapper/gradle-wrapper.properties b/Source/Platforms/Android/Binaries/Project/gradle/wrapper/gradle-wrapper.properties
index 483089527..ee1048a44 100644
--- a/Source/Platforms/Android/Binaries/Project/gradle/wrapper/gradle-wrapper.properties
+++ b/Source/Platforms/Android/Binaries/Project/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-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip