compiler: Update maximum supported edition to EDITION_2024

mkruskal-google · web-flow · commit 2f64092b8a5a · 2025-11-11T15:38:33.000-08:00
gRPC doesn't do anything sensitive to the new 2024 features, but it does
need a new enough libprotoc.
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,11 @@ class JavaGrpcGenerator : public protobuf::compiler::CodeGenerator {`
`58`	`58`	`return protobuf::Edition::EDITION_PROTO2;`
`59`	`59`	`}`
`60`	`60`	`protobuf::Edition GetMaximumEdition() const override {`
	`61`	`+#if GOOGLE_PROTOBUF_VERSION >= 6032000`
	`62`	`+ return protobuf::Edition::EDITION_2024;`
	`63`	`+#else`
`61`	`64`	`return protobuf::Edition::EDITION_2023;`
	`65`	`+#endif`
`62`	`66`	`}`
`63`	`67`	`std::vector<const protobuf::FieldDescriptor*> GetFeatureExtensions()`
`64`	`68`	`const override {`