Updating grpc version to 1.52.1 (#4588)

* Updating grpc version to 1.52.1. See more context here: b/265603879

Author: eldhosembabu

build.gradle

@@ -54,6 +54,7 @@ ext {
     robolectricVersion = libs.versions.robolectric.get()
     protocVersion = libs.versions.protoc.get()
     javaliteVersion = libs.versions.javalite.get()
+    protobufJavaUtilVersion = libs.versions.protobufjavautil.get()
 }
 
 apply plugin: com.google.firebase.gradle.plugins.publish.PublishingPlugin

encoders/firebase-encoders-proto/firebase-encoders-proto.gradle

@@ -44,7 +44,7 @@ dependencies {
 
     testImplementation 'com.google.guava:guava:31.0-jre'
     testImplementation 'junit:junit:4.13.1'
-    testImplementation 'com.google.protobuf:protobuf-java-util:3.11.0'
+    testImplementation "com.google.protobuf:protobuf-java-util:$protobufJavaUtilVersion"
     testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
 

firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle

@@ -94,7 +94,7 @@ dependencies {
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'
-    testImplementation 'com.google.protobuf:protobuf-java-util:3.11.0'
+    testImplementation "com.google.protobuf:protobuf-java-util:$protobufJavaUtilVersion"
     testImplementation 'junit:junit:4.13-beta-2'
 
     //Android compatible version of Apache httpclient.

firebase-ml-modeldownloader/src/androidTest/java/com/google/firebase/ml/modeldownloader/TestGetModelLocal.java

@@ -159,9 +159,11 @@ public void localModel_successTestPath()
     assertTrue(listModelTask.contains(modelUpdatedTask.getResult()));
 
     // delete the old model
-    FirebaseModelDownloader.getInstance().deleteDownloadedModel(MODEL_NAME_LOCAL);
+    Task deleteDownloadedModelTask =
+        FirebaseModelDownloader.getInstance().deleteDownloadedModel(MODEL_NAME_LOCAL);
+    Tasks.await(deleteDownloadedModelTask);
     listModelTask = getDownloadedModelList();
-    assertEquals(listModelTask.size(), 1);
+    assertEquals(1, listModelTask.size());
 
     // verify model file was also deleted
     assertNull(modelTask.getResult().getFile());

gradle/libs.versions.toml

@@ -1,14 +1,17 @@
 [versions]
+# 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.
 android-lint = "30.3.1"
 autovalue = "1.10.1"
 coroutines = "1.6.4"
 dagger = "2.43.2"
-grpc = "1.50.2"
-javalite = "3.17.3"
+grpc = "1.52.1"
+javalite = "3.21.11"
 kotlin = "1.7.10"
-protoc = "3.17.3"
+protoc = "3.21.11"
 robolectric = "4.9"
 truth = "1.1.2"
+protobufjavautil = "3.21.11"
 
 [libraries]
 android-lint = { module = "com.android.tools.lint:lint", version.ref = "android-lint"}
@@ -45,3 +48,4 @@ mockito-core = { module = "org.mockito:mockito-core", version = "2.28.2"}
 mockito-dexmaker = { module = "com.linkedin.dexmaker:dexmaker-mockito", version = "2.28.3"}
 robolectric = {module = "org.robolectric:robolectric", version.ref = "robolectric" }
 truth = { module = "com.google.truth:truth", version.ref = "truth"}
+protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobufjavautil" }

transport/transport-backend-cct/transport-backend-cct.gradle

@@ -63,7 +63,7 @@ dependencies {
     annotationProcessor "com.google.auto.value:auto-value:1.6.5"
     annotationProcessor project(':encoders:firebase-encoders-processor')
 
-    testImplementation 'com.google.protobuf:protobuf-java-util:3.11.0'
+    testImplementation "com.google.protobuf:protobuf-java-util:$protobufJavaUtilVersion"
     testImplementation 'androidx.test:core:1.2.0'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'