From 67754e3c99021b6852385093e4589751083b02a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 18 Apr 2023 10:41:24 +0200
Subject: [PATCH] Android: Upgrade to the latest gradle version.

Android Studio got an upgrade, and as usual comes with new gradle and
integration plugin.
---
 android/build.gradle                     | 3 +++
 build.gradle                             | 2 +-
 gradle.properties                        | 5 ++++-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 86bef63d5732..c40615c07077 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -185,6 +185,9 @@ android {
 		]
 		variant.setIgnore(!needed)
 	}
+	buildFeatures {
+		aidl true
+	}
 }
 afterEvaluate {
 	android.sourceSets.main.assets.getSrcDirs().each { println it }
diff --git a/build.gradle b/build.gradle
index 4bf07011750f..7a9290a97a75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 4d3226abc21b..b9a9a2464056 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b9eead5b1f1b..7c06aedd8b47 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 android.useAndroidX=true
 android.enableJetifier=true