From bd38cfb7c24c9c338efa084b60a05184a6b0721a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= <jpelgrom@users.noreply.github.com>
Date: Fri, 2 Feb 2024 21:27:43 +0100
Subject: [PATCH] Bump Guava to 33.0.0-android (#4177)

- Bump Guava to the latest version, which removes the need for a dependency resolution strategy and (hopefully) un-breaks dependabot updates.
---
 gradle/libs.versions.toml | 2 +-
 wear/build.gradle.kts     | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b544a0df619..d575b3bdd62 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ firebase-bom = "32.7.1"
 firebaseAppdistributionGradle = "4.0.1"
 fragment-ktx = "1.6.2"
 googleServices = "4.4.0"
-guava = "32.1.1-android"
+guava = "33.0.0-android"
 healthServicesClient = "1.0.0-rc01"
 hilt = "2.50"
 iconics = "5.4.0"
diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts
index 4d7a733bcc5..559de7311ad 100644
--- a/wear/build.gradle.kts
+++ b/wear/build.gradle.kts
@@ -128,10 +128,3 @@ dependencies {
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.messaging)
 }
-
-// https://github.com/google/guava/releases/tag/v32.1.0: Reporting dependencies that overlap with Guava
-configurations.all {
-    resolutionStrategy.capabilitiesResolution.withCapability("com.google.guava:listenablefuture") {
-        select("com.google.guava:guava:0")
-    }
-}