From 1eff2421b7f64fd4965f052a6b7d6b2eea5b451c Mon Sep 17 00:00:00 2001
From: Christian Blichmann <cblichmann@google.com>
Date: Thu, 4 Sep 2025 07:29:31 -0700
Subject: [PATCH] Ghidra: Update protobuf to match Ghidra's version

PiperOrigin-RevId: 803017957
Change-Id: Ie4edbc589d666e7d8753b643614a513381a224d6
---
 java/ui/build.gradle    | 20 ++++++++++----------
 java/zylib/build.gradle |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/java/ui/build.gradle b/java/ui/build.gradle
index b5a38a6c..ebda27c3 100644
--- a/java/ui/build.gradle
+++ b/java/ui/build.gradle
@@ -16,7 +16,7 @@ import proguard.gradle.ProGuardTask
 
 buildscript {
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.5'
         classpath 'com.github.johnrengelman:shadow:8.1.1'
         classpath 'com.guardsquare:proguard-gradle:7.4.1'
     }
@@ -31,11 +31,11 @@ protobuf {
     protoc {
         // To manually specify the compiler binary, use:
         // path = '/path/to/protoc'
-        artifact = 'com.google.protobuf:protoc:3.25.1'
+        artifact = 'com.google.protobuf:protoc:4.31.0'
     }
     plugins {
         grpc {
-            artifact = 'io.grpc:protoc-gen-grpc-java:1.60.1'
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.75.0'
         }
     }
     generateProtoTasks {
@@ -50,16 +50,16 @@ dependencies {
     implementation ':y:'
     implementation ':ysvg:'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    implementation 'com.google.errorprone:error_prone_annotations:2.24.1'
+    implementation 'com.google.errorprone:error_prone_annotations:2.30.0'
     implementation 'com.google.flogger:flogger-system-backend:0.8'
     implementation 'com.google.flogger:flogger:0.8'
-    implementation 'com.google.guava:guava:33.0.0-jre'
-    implementation 'com.google.protobuf:protobuf-java-util:3.25.1'
-    implementation 'com.google.protobuf:protobuf-java:3.25.1'
+    implementation 'com.google.guava:guava:33.4.8-jre'
+    implementation 'com.google.protobuf:protobuf-java-util:4.31.0'
+    implementation 'com.google.protobuf:protobuf-java:4.31.0'
     implementation 'commons-cli:commons-cli:1.6.0'
-    implementation 'io.grpc:grpc-netty-shaded:1.60.1'
-    implementation 'io.grpc:grpc-protobuf:1.60.1'
-    implementation 'io.grpc:grpc-stub:1.60.1'
+    implementation 'io.grpc:grpc-netty-shaded:1.75.0'
+    implementation 'io.grpc:grpc-protobuf:1.75.0'
+    implementation 'io.grpc:grpc-stub:1.75.0'
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
     implementation 'org.apache.xmlgraphics:batik-anim:1.17'
     implementation 'org.apache.xmlgraphics:batik-bridge:1.17'
diff --git a/java/zylib/build.gradle b/java/zylib/build.gradle
index 6e5c5260..be2ae618 100644
--- a/java/zylib/build.gradle
+++ b/java/zylib/build.gradle
@@ -15,6 +15,6 @@
 dependencies {
     implementation ':y:'
     implementation ':ysvg:'
-    implementation 'com.google.guava:guava:33.0.0-jre'
+    implementation 'com.google.guava:guava:33.4.8-jre'
     implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
 }