From bd9008f831d0d9b11723b3bcef21892739c8ebcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Thu, 15 Aug 2024 12:36:34 +0200
Subject: [PATCH] Bump Android Gradle Plugin 8.2.2 -> 8.5.2 and Android Tools
 31.2.2 -> 31.5.2

---
 build-plugin/src/main/kotlin/AndroidExtension.kt | 4 ++--
 gradle/libs.versions.toml                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-plugin/src/main/kotlin/AndroidExtension.kt b/build-plugin/src/main/kotlin/AndroidExtension.kt
index fd3455c723..fa70f6782f 100644
--- a/build-plugin/src/main/kotlin/AndroidExtension.kt
+++ b/build-plugin/src/main/kotlin/AndroidExtension.kt
@@ -2,7 +2,7 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.artifacts.dsl.DependencyHandler
 
-internal fun CommonExtension<*, *, *, *, *>.configureSharedConfig() {
+internal fun CommonExtension<*, *, *, *, *, *>.configureSharedConfig() {
     compileSdk = ThunderbirdProjectConfig.androidSdkCompile
 
     defaultConfig {
@@ -46,7 +46,7 @@ internal fun CommonExtension<*, *, *, *, *>.configureSharedConfig() {
     }
 }
 
-internal fun CommonExtension<*, *, *, *, *>.configureSharedComposeConfig(libs: LibrariesForLibs) {
+internal fun CommonExtension<*, *, *, *, *, *>.configureSharedComposeConfig(libs: LibrariesForLibs) {
     buildFeatures {
         compose = true
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 56926656a8..513ace3d8e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,8 +14,8 @@
 androidDesugar = "2.0.4"
 androidMaterial = "1.12.0"
 # AGP and tools should be updated together
-androidGradlePlugin = "8.2.2"
-androidTools = "31.2.2"
+androidGradlePlugin = "8.5.2"
+androidTools = "31.5.2"
 androidxActivity = "1.8.2"
 androidxAnnotation = "1.8.0"
 androidxAppCompat = "1.6.1"