Upgrade dependencies

ejona86 · web-flow · commit c985797d9079 · 2023-12-12T12:40:20.000-08:00
All the changes outside libs.versions.toml and examples were
because of ErrorProne. It didn't actually find anything to fix; signal
vs noise has gotten pretty bad with the newer checks.

Status was changed for ErrorProne's SuperCallToObjectMethod. With the
old code it didn't notice the trivial implementation. The fail-for-test
code wasn't used, so it was easiest to just remove it.

Some of the libs had their versions inlined; now that we have
:checkForUpdates it isn't much of a risk for versions to diverge when
there's only a few artifacts sharing a version. If we need 4+ artifacts
to have the same version, then it makes sense to still use a shared
version.

Dependencies not upgraded: google-auth-libray, mockito, netty, cronet
diff --git a/api/src/main/java/io/grpc/Status.java b/api/src/main/java/io/grpc/Status.java
@@ -234,10 +234,6 @@ private byte[] valueAscii() {
     }
   }
 
-  private static final String TEST_EQUALS_FAILURE_PROPERTY = "io.grpc.Status.failOnEqualsForTest";
-  private static final boolean FAIL_ON_EQUALS_FOR_TEST =
-      Boolean.parseBoolean(System.getProperty(TEST_EQUALS_FAILURE_PROPERTY, "false"));
-  
   // Create the canonical list of Status instances indexed by their code values.
   private static final List<Status> STATUS_LIST = buildStatusList();
 
@@ -662,8 +658,6 @@ private static String parseAsciiStringSlow(byte[] value) {
    */
   @Override
   public boolean equals(Object obj) {
-    assert !FAIL_ON_EQUALS_FOR_TEST
-        : "Status.equals called; disable this by setting " + TEST_EQUALS_FAILURE_PROPERTY;
     return super.equals(obj);
   }
 
diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle
@@ -32,7 +32,7 @@ android {
 }
 
 protobuf {
-    protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
+    protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
     plugins {
         grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
         }
@@ -60,6 +60,6 @@ dependencies {
     implementation 'org.apache.tomcat:annotations-api:6.0.53'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'com.google.truth:truth:1.0.1'
+    testImplementation 'com.google.truth:truth:1.1.5'
     testImplementation 'io.grpc:grpc-testing:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
 }
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
@@ -30,7 +30,7 @@ android {
 }
 
 protobuf {
-    protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
+    protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
     plugins {
         grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
         }
diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
@@ -30,7 +30,7 @@ android {
 }
 
 protobuf {
-    protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
+    protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
     plugins {
         grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
         }
diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle
@@ -31,7 +31,7 @@ android {
 }
 
 protobuf {
-    protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
+    protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
     plugins {
         grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
         }
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -24,7 +24,7 @@ java {
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protobufVersion = '3.24.0'
+def protobufVersion = '3.25.1'
 def protocVersion = protobufVersion
 
 dependencies {
@@ -40,7 +40,7 @@ dependencies {
 
     testImplementation "io.grpc:grpc-testing:${grpcVersion}"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.mockito:mockito-core:3.4.0"
+    testImplementation "org.mockito:mockito-core:4.4.0"
 }
 
 protobuf {
diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle
@@ -25,7 +25,7 @@ java {
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protocVersion = '3.24.0'
+def protocVersion = '3.25.1'
 
 dependencies {
     // grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub
diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle
@@ -26,7 +26,7 @@ java {
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protobufVersion = '3.24.0'
+def protobufVersion = '3.25.1'
 
 dependencies {
     implementation "io.grpc:grpc-protobuf:${grpcVersion}"
diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protoc.version>3.24.0</protoc.version>
+    <protoc.version>3.25.1</protoc.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -58,7 +58,7 @@
     <dependency> <!-- prevent downgrade of version in protobuf-java-util from grpc-services -->
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.0.1-jre</version>
+      <version>32.1.3-jre</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle
@@ -25,7 +25,7 @@ java {
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protobufVersion = '3.24.0'
+def protobufVersion = '3.25.1'
 def protocVersion = protobufVersion
 
 
@@ -34,7 +34,7 @@ dependencies {
     implementation "io.grpc:grpc-stub:${grpcVersion}"
     implementation "io.grpc:grpc-auth:${grpcVersion}"
     compileOnly "org.apache.tomcat:annotations-api:6.0.53"
-    implementation "com.google.auth:google-auth-library-oauth2-http:0.9.0"
+    implementation "com.google.auth:google-auth-library-oauth2-http:1.4.0"
     implementation "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24"
     runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
 }
diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protobuf.version>3.24.0</protobuf.version>
+    <protobuf.version>3.25.1</protobuf.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-oauth2-http</artifactId>
-      <version>0.9.0</version>
+      <version>1.4.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.4.0</version>
+      <version>4.4.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle
@@ -26,7 +26,7 @@ java {
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protocVersion = '3.24.0'
+def protocVersion = '3.25.1'
 
 dependencies {
     implementation "io.grpc:grpc-protobuf:${grpcVersion}"
diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle
@@ -24,7 +24,7 @@ java {
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protobufVersion = '3.24.0'
+def protobufVersion = '3.25.1'
 
 dependencies {
     implementation "io.grpc:grpc-protobuf:${grpcVersion}"
diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protoc.version>3.24.0</protoc.version>
+    <protoc.version>3.25.1</protoc.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -58,7 +58,7 @@
     <dependency> <!-- prevent downgrade of version in protobuf-java-util from grpc-services -->
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.0.1-jre</version>
+      <version>32.1.3-jre</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle
@@ -24,7 +24,7 @@ java {
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protobufVersion = '3.24.0'
+def protobufVersion = '3.25.1'
 def protocVersion = protobufVersion
 
 dependencies {
@@ -39,7 +39,7 @@ dependencies {
 
     testImplementation "io.grpc:grpc-testing:${grpcVersion}"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.mockito:mockito-core:3.4.0"
+    testImplementation "org.mockito:mockito-core:4.4.0"
 }
 
 protobuf {
diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml
@@ -14,8 +14,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protobuf.version>3.24.0</protobuf.version>
-    <protoc.version>3.24.0</protoc.version>
+    <protobuf.version>3.25.1</protobuf.version>
+    <protoc.version>3.25.1</protoc.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.4.0</version>
+      <version>4.4.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle
@@ -24,7 +24,7 @@ java {
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protobufVersion = '3.24.0'
+def protobufVersion = '3.25.1'
 def protocVersion = protobufVersion
 
 dependencies {
@@ -39,7 +39,7 @@ dependencies {
 
     testImplementation "io.grpc:grpc-testing:${grpcVersion}"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.mockito:mockito-core:3.4.0"
+    testImplementation "org.mockito:mockito-core:4.4.0"
 }
 
 protobuf {
diff --git a/examples/example-oauth/pom.xml b/examples/example-oauth/pom.xml
@@ -14,8 +14,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protobuf.version>3.24.0</protobuf.version>
-    <protoc.version>3.24.0</protoc.version>
+    <protobuf.version>3.25.1</protobuf.version>
+    <protoc.version>3.25.1</protoc.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.4.0</version>
+      <version>4.4.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle
@@ -19,7 +19,7 @@ java {
 }
 
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protocVersion = '3.24.0'
+def protocVersion = '3.25.1'
 
 dependencies {
     implementation "io.grpc:grpc-protobuf:${grpcVersion}"
diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle
@@ -19,7 +19,7 @@ java {
 }
 
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protocVersion = '3.24.0'
+def protocVersion = '3.25.1'
 
 dependencies {
     implementation "io.grpc:grpc-protobuf:${grpcVersion}"
diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle
@@ -17,7 +17,7 @@ java {
 }
 
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protocVersion = '3.24.0'
+def protocVersion = '3.25.1'
 
 dependencies {
     implementation "io.grpc:grpc-protobuf:${grpcVersion}",
diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle
@@ -25,7 +25,7 @@ java {
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protocVersion = '3.24.0'
+def protocVersion = '3.25.1'
 
 dependencies {
     implementation "io.grpc:grpc-protobuf:${grpcVersion}"
diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protoc.version>3.24.0</protoc.version>
+    <protoc.version>3.25.1</protoc.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle
@@ -24,7 +24,7 @@ java {
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def protocVersion = '3.24.0'
+def protocVersion = '3.25.1'
 
 dependencies {
     implementation "io.grpc:grpc-protobuf:${grpcVersion}"
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -13,8 +13,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protobuf.version>3.24.0</protobuf.version>
-    <protoc.version>3.24.0</protoc.version>
+    <protobuf.version>3.25.1</protobuf.version>
+    <protoc.version>3.25.1</protoc.version>
     <!-- required for JDK 8 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -55,20 +55,10 @@
       <artifactId>protobuf-java-util</artifactId>
       <version>${protobuf.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.10.1</version> <!-- prevent downgrade via protobuf-java-util -->
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.0.1-jre</version> <!-- prevent downgrade of version in protobuf-java-util -->
-    </dependency>
-    <dependency>
-      <groupId>com.google.j2objc</groupId>
-      <artifactId>j2objc-annotations</artifactId>
-      <version>2.8</version> <!-- prevent downgrade of version in guava -->
+      <version>32.1.3-jre</version> <!-- prevent downgrade of version in protobuf-java-util -->
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
@@ -90,7 +80,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.4.0</version>
+      <version>4.4.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingChannelInterceptorTest.java b/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingChannelInterceptorTest.java
@@ -58,7 +58,6 @@
 import io.opencensus.trace.TraceId;
 import io.opencensus.trace.TraceOptions;
 import io.opencensus.trace.Tracestate;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.charset.Charset;
@@ -104,7 +103,8 @@ public class InternalLoggingChannelInterceptorTest {
   private AtomicReference<Object> actualRequest;
   private SettableFuture<Void> halfCloseCalled;
   private SettableFuture<Void> cancelCalled;
-  private SocketAddress peer;
+  @SuppressWarnings("AddressSelection") // It will only be one address
+  private SocketAddress peer = new InetSocketAddress("127.0.0.1", 1234);
   private LogHelper mockLogHelper;
   private ConfigFilterHelper mockFilterHelper;
   private FilterParams filterParams;
@@ -119,7 +119,6 @@ public void setup() throws Exception {
     actualRequest = new AtomicReference<>();
     halfCloseCalled = SettableFuture.create();
     cancelCalled = SettableFuture.create();
-    peer = new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 1234);
     filterParams = FilterParams.create(true, 0, 0);
   }
 
diff --git a/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingServerInterceptorTest.java b/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/InternalLoggingServerInterceptorTest.java
diff --git a/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/LogHelperTest.java b/gcp-observability/src/test/java/io/grpc/gcp/observability/interceptors/LogHelperTest.java
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/netty/src/test/java/io/grpc/netty/NettyAdaptiveCumulatorTest.java b/netty/src/test/java/io/grpc/netty/NettyAdaptiveCumulatorTest.java
diff --git a/netty/src/test/java/io/grpc/netty/NettyChannelBuilderTest.java b/netty/src/test/java/io/grpc/netty/NettyChannelBuilderTest.java
diff --git a/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java b/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java
diff --git a/okhttp/build.gradle b/okhttp/build.gradle
diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
diff --git a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Credentials.java b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Credentials.java
diff --git a/repositories.bzl b/repositories.bzl
diff --git a/services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java b/services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java

Original file line number	Diff line number	Diff line change
`@@ -234,10 +234,6 @@ private byte[] valueAscii() {`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
`237`		`- private static final String TEST_EQUALS_FAILURE_PROPERTY = "io.grpc.Status.failOnEqualsForTest";`
`238`		`- private static final boolean FAIL_ON_EQUALS_FOR_TEST =`
`239`		`- Boolean.parseBoolean(System.getProperty(TEST_EQUALS_FAILURE_PROPERTY, "false"));`
`240`		`-`
`241`	`237`	`// Create the canonical list of Status instances indexed by their code values.`
`242`	`238`	`private static final List<Status> STATUS_LIST = buildStatusList();`
`243`	`239`
`@@ -662,8 +658,6 @@ private static String parseAsciiStringSlow(byte[] value) {`
`662`	`658`	`*/`
`663`	`659`	`@Override`
`664`	`660`	`public boolean equals(Object obj) {`
`665`		`- assert !FAIL_ON_EQUALS_FOR_TEST`
`666`		`- : "Status.equals called; disable this by setting " + TEST_EQUALS_FAILURE_PROPERTY;`
`667`	`661`	`return super.equals(obj);`
`668`	`662`	`}`
`669`	`663`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ android {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`protobuf {`
`35`		`- protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }`
	`35`	`+ protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }`
`36`	`36`	`plugins {`
`37`	`37`	`grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`38`	`38`	`}`
`@@ -60,6 +60,6 @@ dependencies {`
`60`	`60`	`implementation 'org.apache.tomcat:annotations-api:6.0.53'`
`61`	`61`
`62`	`62`	`testImplementation 'junit:junit:4.13.2'`
`63`		`- testImplementation 'com.google.truth:truth:1.0.1'`
	`63`	`+ testImplementation 'com.google.truth:truth:1.1.5'`
`64`	`64`	`testImplementation 'io.grpc:grpc-testing:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ android {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`protobuf {`
`33`		`- protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }`
	`33`	`+ protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }`
`34`	`34`	`plugins {`
`35`	`35`	`grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ android {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`protobuf {`
`34`		`- protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }`
	`34`	`+ protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }`
`35`	`35`	`plugins {`
`36`	`36`	`grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION`
`37`	`37`	`}`