Merge branch 'refs/heads/main' into crashlytics-kts-customKey

Author: mrober

firebase-common/data-collection-tests/data-collection-tests.gradle.kts

@@ -36,6 +36,7 @@ android {
 dependencies {
   implementation("com.google.firebase:firebase-common:21.0.0")
   implementation("com.google.firebase:firebase-components:18.0.0")
+  implementation(platform(libs.kotlin.bom))
 
   testImplementation(libs.androidx.core)
   testImplementation(libs.androidx.test.junit)

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'

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 {
 

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"
@@ -62,6 +62,7 @@ grpc-protoc-gen-kotlin = { module = "io.grpc:protoc-gen-grpc-kotlin", version.re
 grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
 javax-annotation-jsr250 = { module = "javax.annotation:jsr250-api", version = "1.0" }
 javax-inject = { module = "javax.inject:javax.inject", version = "1" }
+kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-coroutines-tasks = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "coroutines" }