From 429650f681c00af6560e6133d7652723e58cb15c Mon Sep 17 00:00:00 2001
From: Gray Mackall <34871572+gmackall@users.noreply.github.com>
Date: Thu, 3 Oct 2024 09:40:32 -0700
Subject: [PATCH] [camera, google_sign_in, espresso] Bump guava to version
 `33.3.1`. (#7773)

Fixes https://github.com/flutter/flutter/issues/155458
Fixes https://github.com/flutter/flutter/issues/154586

Bumps Guava to `33.3.1`, as from what I can tell we were essentially hitting https://github.com/google/guava/issues/7397, from a [comment](https://github.com/google/guava/issues/7397#issuecomment-2368390150) on the issue:
> I'm a little surprised that AGP wouldn't have complained already for any builds that depended on Guava classes that used those annotations, since it presumably wouldn't find the annotations on the runtime classpath.

I believe this maintainers suspicions were warranted, as it seems AGP was complaining in our case!

That issue was fixed in version `33.3.1` of Guava. Verified that I could re-create the failure in the [first issue](https://github.com/flutter/flutter/issues/155458), and then verified that it was fixed with no additional proguard rules by upgrading the Guava version used by the `google_sign_in` plugin. Decided to make the upgrade everywhere we use guava, so we don't hit it in another plugin later.
---
 packages/camera/camera_android_camerax/CHANGELOG.md           | 4 ++++
 packages/camera/camera_android_camerax/android/build.gradle   | 2 +-
 packages/camera/camera_android_camerax/pubspec.yaml           | 2 +-
 packages/espresso/CHANGELOG.md                                | 4 ++++
 packages/espresso/android/build.gradle                        | 2 +-
 packages/espresso/pubspec.yaml                                | 2 +-
 packages/google_sign_in/google_sign_in_android/CHANGELOG.md   | 4 ++++
 .../google_sign_in_android/android/build.gradle               | 2 +-
 packages/google_sign_in/google_sign_in_android/pubspec.yaml   | 2 +-
 9 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md
index 8e52b23bd6..e9cd8fc14d 100644
--- a/packages/camera/camera_android_camerax/CHANGELOG.md
+++ b/packages/camera/camera_android_camerax/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.9+1
+
+* Bumps `com.google.guava:guava` from `33.3.0` to `33.3.1`.
+
 ## 0.6.9
 
 * Corrects assumption about automatic preview correction happening on API >= 29 to API > 29,
diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle
index 15c0e47bd0..311d766ded 100644
--- a/packages/camera/camera_android_camerax/android/build.gradle
+++ b/packages/camera/camera_android_camerax/android/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
     implementation "androidx.camera:camera-video:${camerax_version}"
-    implementation 'com.google.guava:guava:33.3.0-android'
+    implementation 'com.google.guava:guava:33.3.1-android'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-inline:5.0.0'
     testImplementation 'androidx.test:core:1.4.0'
diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml
index beb2668807..3f4cc16667 100644
--- a/packages/camera/camera_android_camerax/pubspec.yaml
+++ b/packages/camera/camera_android_camerax/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera_android_camerax
 description: Android implementation of the camera plugin using the CameraX library.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.6.9
+version: 0.6.9+1
 
 environment:
   sdk: ^3.5.0
diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
index ea65202eda..0f95ac505d 100644
--- a/packages/espresso/CHANGELOG.md
+++ b/packages/espresso/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+2
+
+* Bumps `com.google.guava:guava` from `31.1` to `33.3.1`.
+
 ## 0.4.0+1
 
 * Updates lint checks to ignore NewerVersionAvailable.
diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle
index c430c39873..33eebfa7b7 100644
--- a/packages/espresso/android/build.gradle
+++ b/packages/espresso/android/build.gradle
@@ -60,7 +60,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.guava:guava:31.1-android'
+    implementation 'com.google.guava:guava:33.3.1-android'
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     androidTestImplementation 'org.hamcrest:hamcrest:2.2'
diff --git a/packages/espresso/pubspec.yaml b/packages/espresso/pubspec.yaml
index b68b22e4f6..871d4cd7a5 100644
--- a/packages/espresso/pubspec.yaml
+++ b/packages/espresso/pubspec.yaml
@@ -3,7 +3,7 @@ description: Java classes for testing Flutter apps using Espresso.
   Allows driving Flutter widgets from a native Espresso test.
 repository: https://github.com/flutter/packages/tree/main/packages/espresso
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+espresso%22
-version: 0.4.0+1
+version: 0.4.0+2
 
 environment:
   sdk: ^3.4.0
diff --git a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md
index 27caf3548b..29eed92b1a 100644
--- a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md
+++ b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.1.31
+
+* Bumps `com.google.guava:guava` from `32.0.1` to `33.3.1`.
+
 ## 6.1.30
 
 * Temporarily downgrades Guava from version 33.3.0 to 32.0.1 to fix an R8 related error.
diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle
index fda33f4278..8eea7909ac 100644
--- a/packages/google_sign_in/google_sign_in_android/android/build.gradle
+++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle
@@ -60,7 +60,7 @@ android {
 
 dependencies {
     implementation 'com.google.android.gms:play-services-auth:21.0.0'
-    implementation 'com.google.guava:guava:32.0.1-android'
+    implementation 'com.google.guava:guava:33.3.1-android'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-inline:5.0.0'
 }
diff --git a/packages/google_sign_in/google_sign_in_android/pubspec.yaml b/packages/google_sign_in/google_sign_in_android/pubspec.yaml
index 5438eb2074..1fbc4f3795 100644
--- a/packages/google_sign_in/google_sign_in_android/pubspec.yaml
+++ b/packages/google_sign_in/google_sign_in_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_sign_in_android
 description: Android implementation of the google_sign_in plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
-version: 6.1.30
+version: 6.1.31
 
 environment:
   sdk: ^3.4.0