From 1a17a3b869fbcc9d45f592a30193145cf9077837 Mon Sep 17 00:00:00 2001
From: Rodrigo Lazo Paz <rlazo@google.com>
Date: Fri, 22 Nov 2024 18:01:57 -0500
Subject: [PATCH 1/2] Bump AGP version to 8.3.2

This is the latest version of AGP we can bump to without requiring us
to bump gradle too.
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 172b219bbaa..20e222cb822 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 # javalite, protoc and protobufjavautil versions should be in sync while updating and
 # it needs to match the protobuf version which grpc has transitive dependency on, which
 # needs to match the version of grpc that grpc-kotlin has a transitive dependency on.
-androidGradlePlugin = "8.2.1"
+androidGradlePlugin = "8.3.2"
 android-lint = "31.3.2"
 autovalue = "1.10.1"
 coroutines = "1.7.3"

From 04caaaf7ca7c713401b7d52709aa3c764b1e4ee8 Mon Sep 17 00:00:00 2001
From: Rodrigo Lazo Paz <rlazo@google.com>
Date: Wed, 27 Nov 2024 10:24:21 -0500
Subject: [PATCH 2/2] Include explicitly protobuf dependency on testing

---
 firebase-firestore/firebase-firestore.gradle                    | 1 +
 .../java/com/google/firebase/firestore/remote/TestingHooks.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
index 35524fb9239..c02a044e460 100644
--- a/firebase-firestore/firebase-firestore.gradle
+++ b/firebase-firestore/firebase-firestore.gradle
@@ -152,6 +152,7 @@ dependencies {
 
     testImplementation project(':firebase-database-collection')
     testImplementation project(':firebase-firestore')
+    testProtobuf("com.google.api.grpc:proto-google-common-protos:1.18.0")
     testImplementation libs.androidx.test.core
     testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
     testImplementation 'com.google.android.gms:play-services-tasks:18.0.1'
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TestingHooks.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TestingHooks.java
index 9673504ed04..44cbcec97cb 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TestingHooks.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TestingHooks.java
@@ -16,6 +16,7 @@
 
 import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
 
+import android.annotation.SuppressLint;
 import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -34,6 +35,7 @@
  *
  * <p>Do not use this class except for testing purposes.
  */
+@SuppressLint("SupportAnnotationUsage")
 @VisibleForTesting
 final class TestingHooks {