From e2a0156edad4c3eed1a18543b30069b5431f67ec Mon Sep 17 00:00:00 2001
From: Finn Carroll <carrofin@amazon.com>
Date: Tue, 12 Nov 2024 14:02:41 -0800
Subject: [PATCH] Bump versions for gRPC service stubs

Signed-off-by: Finn Carroll <carrofin@amazon.com>
---
 gradle/libs.versions.toml |  4 ++--
 server/build.gradle       | 20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bc64e3ef61fb1..8dbf21f440feb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,11 +26,11 @@ tdigest           = "3.3"
 hdrhistogram      = "2.2.2"
 
 # gRPC
-grpc              = "1.68.0"
+grpc              = "1.68.1"
 protobuf          = "3.25.5"
 guava             = "32.1.1-jre"
 jsr305            = "3.0.2"
-failureaccess     = "1.0.2"
+failureaccess     = "1.0.1"
 error_prone_annotations = "2.24.1"
 javax_annotations = "1.3.2"
 perfmark_api      = "0.26.0"
diff --git a/server/build.gradle b/server/build.gradle
index c19e171c90f96..d26ba06ec9966 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -124,8 +124,15 @@ dependencies {
 
   // protobuf
   api "com.google.protobuf:protobuf-java:${versions.protobuf}"
+  api "com.google.protobuf:protobuf-java-util:${versions.protobuf}"
   api "jakarta.annotation:jakarta.annotation-api:${versions.jakarta_annotation}"
 
+  // gRPC
+  api "io.grpc:grpc-stub:${versions.grpc}"
+  api "io.grpc:grpc-protobuf:${versions.grpc}"
+  api "io.grpc:grpc-core:${versions.grpc}"
+  api "io.grpc:grpc-api:${versions.grpc}"
+
   // https://mvnrepository.com/artifact/org.roaringbitmap/RoaringBitmap
   implementation 'org.roaringbitmap:RoaringBitmap:1.3.0'
 
@@ -224,12 +231,19 @@ protobuf {
     artifact = "com.google.protobuf:protoc:${versions.protobuf}"
   }
 
+  plugins {
+    grpc {
+      artifact = "io.grpc:protoc-gen-grpc-java:${versions.grpc}"
+    }
+  }
+
   generateProtoTasks {
     all().each { task ->
       task.builtins {
-        java {
-          option "annotate_code"
-        }
+        java {}
+      }
+      task.plugins {
+        grpc {}
       }
     }
   }