From 3a562c150e585597fcba366a185f32a9419a7909 Mon Sep 17 00:00:00 2001
From: Albin <albin@mullvad.net>
Date: Tue, 13 Aug 2024 10:33:44 +0200
Subject: [PATCH] Bump agp to 8.5.2

Also:
* Enables gradle plugin lint check.
* Documents gradle dependency lint check.
* Removes experimental lint configuration.
---
 android/config/lint.xml           | 5 ++---
 android/gradle.properties         | 1 -
 android/gradle/libs.versions.toml | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/android/config/lint.xml b/android/config/lint.xml
index b885b0b711aa..7e117311654f 100644
--- a/android/config/lint.xml
+++ b/android/config/lint.xml
@@ -7,9 +7,8 @@
     <issue id="UnusedResources">
         <ignore path="res/values/strings.xml" />
     </issue>
-    <!-- We are currently not using the ellipsis character -->
+    <!-- We are currently not using the ellipsis character. -->
     <issue id="TypographyEllipsis" severity="ignore" />
-    <!-- Temporarily ignore the below checks while migrating to version catalogs. -->
+    <!-- Ignore since we currently treat warnings as errors. -->
     <issue id="GradleDependency" severity="ignore" />
-    <issue id="AndroidGradlePluginVersion" severity="ignore" />
 </lint>
diff --git a/android/gradle.properties b/android/gradle.properties
index 324e171187d3..74c277e3a155 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -3,4 +3,3 @@ android.nonTransitiveRClass=false
 android.useAndroidX=true
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M"
-android.experimental.lint.version = 8.4.0
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index f603f7005337..50b1a458d63a 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -3,8 +3,8 @@
 # The android-gradle-aapt plugin version must be in sync with the android plugin version.
 # Required for Gradle metadata verification to work properly, see:
 # https://github.com/gradle/gradle/issues/19228
-android-gradle-plugin = "8.3.0"
-android-gradle-aapt = "10880808"
+android-gradle-plugin = "8.5.2"
+android-gradle-aapt = "11315950"
 android-billingclient = "6.2.0"
 android-volley = "1.2.1"