From fdc84ec6f7879b279570b6b62a61d7d79ebe2c18 Mon Sep 17 00:00:00 2001
From: Gray Mackall <34871572+gmackall@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:53:55 -0700
Subject: [PATCH] [google_sign_in_android] Downgrade Guava version from
 `33.3.0` to `32.0.1` (#7573)

This upgrade is causing issues with our use of R8. I think we should downgrade back, while we investigate what it takes to unblock this upgrade.

Fixes https://github.com/flutter/flutter/issues/154489,
related to https://github.com/flutter/packages/pull/7571#discussion_r1742551066.
---
 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 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

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 daa33d98b1af..27caf3548b97 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.30
+
+* Temporarily downgrades Guava from version 33.3.0 to 32.0.1 to fix an R8 related error.
+
 ## 6.1.29
 
 * Updates Guava to version 33.3.0.
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 a918961b8733..fda33f4278ea 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:33.3.0-android'
+    implementation 'com.google.guava:guava:32.0.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 e176285ffcf2..0f34f1d3f422 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.29
+version: 6.1.30
 
 environment:
   sdk: ^3.4.0