From 4496627c653b07c9b81307c43f6f48ebb53d5d53 Mon Sep 17 00:00:00 2001
From: lihenggui <solo8web@gmail.com>
Date: Mon, 13 May 2024 14:23:07 -0700
Subject: [PATCH] Upgrade AGP to 8.4.0, Android Build Tools to 31.4.0, and
 Gradle to 8.7.

---
 gradle/libs.versions.toml                | 6 +++---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 sync/work/build.gradle.kts               | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6bc85e10e..60a9a37cb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,8 +2,8 @@
 accompanist = "0.34.0"
 androidDesugarJdkLibs = "2.0.4"
 # AGP and tools should be updated together
-androidGradlePlugin = "8.3.0"
-androidTools = "31.3.0"
+androidGradlePlugin = "8.4.0"
+androidTools = "31.4.0"
 androidxActivity = "1.8.0"
 androidxAppCompat = "1.6.1"
 androidxBrowser = "1.8.0"
@@ -18,7 +18,7 @@ androidxDataStore = "1.0.0"
 androidxEspresso = "3.5.1"
 androidxHiltNavigationCompose = "1.2.0"
 androidxLifecycle = "2.7.0"
-androidxMacroBenchmark = "1.2.2"
+androidxMacroBenchmark = "1.2.4"
 androidxMetrics = "1.0.0-alpha04"
 androidxNavigation = "2.8.0-alpha06"
 androidxProfileinstaller = "1.3.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e0930..b82aa23a4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sync/work/build.gradle.kts b/sync/work/build.gradle.kts
index 97e3eace2..7e61c7389 100644
--- a/sync/work/build.gradle.kts
+++ b/sync/work/build.gradle.kts
@@ -40,5 +40,6 @@ dependencies {
 
     androidTestImplementation(libs.androidx.work.testing)
     androidTestImplementation(libs.hilt.android.testing)
+    androidTestImplementation(libs.kotlinx.coroutines.guava)
     androidTestImplementation(projects.core.testing)
 }