From c76751344e94db66046d2f50cf5a8005faf955a6 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com>
Date: Thu, 6 Nov 2025 13:06:58 -0800
Subject: [PATCH 1/2] Update maximum supported edition to EDITION_2024

gRPC doesn't do anything sensitive to the new 2024 features
---
 compiler/src/java_plugin/cpp/java_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/java_plugin/cpp/java_plugin.cpp b/compiler/src/java_plugin/cpp/java_plugin.cpp
index a595a6a6896..9c3ab0d22be 100644
--- a/compiler/src/java_plugin/cpp/java_plugin.cpp
+++ b/compiler/src/java_plugin/cpp/java_plugin.cpp
@@ -58,7 +58,7 @@ class JavaGrpcGenerator : public protobuf::compiler::CodeGenerator {
     return protobuf::Edition::EDITION_PROTO2;
   }
   protobuf::Edition GetMaximumEdition() const override {
-    return protobuf::Edition::EDITION_2023;
+    return protobuf::Edition::EDITION_2024;
   }
   std::vector<const protobuf::FieldDescriptor*> GetFeatureExtensions()
       const override {

From cb9747f9e48e2ec377836868744ca73e60c788b3 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Tue, 11 Nov 2025 14:39:46 -0800
Subject: [PATCH 2/2] Condition edition support on the version of libprotoc

---
 compiler/src/java_plugin/cpp/java_plugin.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compiler/src/java_plugin/cpp/java_plugin.cpp b/compiler/src/java_plugin/cpp/java_plugin.cpp
index 9c3ab0d22be..4b02d6e9884 100644
--- a/compiler/src/java_plugin/cpp/java_plugin.cpp
+++ b/compiler/src/java_plugin/cpp/java_plugin.cpp
@@ -58,7 +58,11 @@ class JavaGrpcGenerator : public protobuf::compiler::CodeGenerator {
     return protobuf::Edition::EDITION_PROTO2;
   }
   protobuf::Edition GetMaximumEdition() const override {
+#if GOOGLE_PROTOBUF_VERSION >= 6032000
     return protobuf::Edition::EDITION_2024;
+#else
+    return protobuf::Edition::EDITION_2023;
+#endif
   }
   std::vector<const protobuf::FieldDescriptor*> GetFeatureExtensions()
       const override {