From e2e2a8ee0bb9b4b6198cf89605a829d5c687e667 Mon Sep 17 00:00:00 2001
From: Dominique Padiou <5765435+dpad85@users.noreply.github.com>
Date: Wed, 12 Jun 2024 16:02:57 +0200
Subject: [PATCH] Upgrade gradle to 8.6 and AGP to 8.4

---
 build.gradle.kts                         | 2 +-
 buildSrc/src/main/kotlin/Versions.kt     | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 phoenix-legacy/build.gradle.kts          | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 08537a3fe..74d5da5e4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("com.android.tools.build:gradle:8.4.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
         classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}")
         classpath("app.cash.sqldelight:gradle-plugin:${Versions.sqlDelight}")
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 394db9fed..0f7e9b792 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -11,7 +11,7 @@ object Versions {
     const val slf4j = "1.7.30"
     const val junit = "4.13"
 
-    const val fcmPlugin = "4.3.10"
+    const val fcmPlugin = "4.4.2"
 
     object Android {
         const val coreKtx = "1.9.0"
@@ -26,7 +26,7 @@ object Versions {
         const val biometrics = "1.1.0"
 
         const val zxing = "4.1.0"
-        const val fcm = "22.0.0"
+        const val fcm = "24.0.0"
         const val logback = "2.0.0"
 
         const val testRunner = "1.3.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0597b77e6..7b8b1c82e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
diff --git a/phoenix-legacy/build.gradle.kts b/phoenix-legacy/build.gradle.kts
index f73cf5c89..197c98a1d 100644
--- a/phoenix-legacy/build.gradle.kts
+++ b/phoenix-legacy/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
   id("kotlin-kapt")
   id("kotlin-parcelize")
   id("androidx.navigation.safeargs.kotlin")
-  id("com.google.gms.google-services")
   id("app.cash.sqldelight")
   id("kotlinx-serialization")
 }