Enable edition 2024 support in protoc and language generators for cpp, hpb, java, kotlin, objectivec, php, python, pyi, rust.

zhangskz · copybara-github · commit 26843b3c6064 · 2025-06-27T16:55:51.000-07:00
PiperOrigin-RevId: 776765229
diff --git a/hpb_generator/generator.h b/hpb_generator/generator.h
@@ -34,7 +34,9 @@ class Generator : public protoc::CodeGenerator {
            Feature::FEATURE_SUPPORTS_EDITIONS;
   }
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
 };
 
 }  // namespace protobuf
diff --git a/src/google/protobuf/compiler/code_generator.h b/src/google/protobuf/compiler/code_generator.h
@@ -179,7 +179,9 @@ class PROTOC_EXPORT CodeGenerator {
 // The minimum edition supported by protoc.
 constexpr auto ProtocMinimumEdition() { return Edition::EDITION_PROTO2; }
 // The maximum edition supported by protoc.
-constexpr auto ProtocMaximumEdition() { return Edition::EDITION_2023; }
+constexpr auto ProtocMaximumEdition() {
+  return Edition::EDITION_2024;
+}
 
 // The maximum edition known to protoc, which may or may not be officially
 // supported yet.  During development of a new edition, this will typically be
diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc
@@ -1578,7 +1578,7 @@ TEST_F(CommandLineInterfaceTest, InvalidMaximumEditionError) {
   Run("protocol_compiler --proto_path=$tmpdir --test_out=$tmpdir foo.proto");
   ExpectErrorSubstring(
       "generator --test_out specifies a maximum edition 99999_TEST_ONLY which "
-      "is not the protoc maximum 2023");
+      "is not the protoc maximum");
 }
 
 TEST_F(CommandLineInterfaceTest, InvalidFeatureExtensionError) {
@@ -2009,21 +2009,6 @@ TEST_F(CommandLineInterfaceTest, PluginErrorAndNoEditionsSupport) {
       "--plug_out: foo.proto: Saw message type MockCodeGenerator_Error.");
 }
 
-TEST_F(CommandLineInterfaceTest, AfterProtocMaximumEditionError) {
-  CreateTempFile("foo.proto",
-                 R"schema(
-    edition = "2024";
-    package foo;
-    message Foo {
-    }
-  )schema");
-
-  Run("protocol_compiler --proto_path=$tmpdir --test_out=$tmpdir foo.proto");
-  ExpectErrorSubstring(
-      "foo.proto: is a file using edition 2024, which is later than the protoc "
-      "maximum supported edition 2023.");
-}
-
 TEST_F(CommandLineInterfaceTest, AfterProtocMaximumEditionAllowlisted) {
   constexpr absl::string_view path = "google/protobuf";
   CreateTempFile(absl::StrCat(path, "/foo.proto"),
@@ -2083,52 +2068,66 @@ TEST_F(CommandLineInterfaceTest, EditionDefaults) {
 
   FeatureSetDefaults defaults = ReadEditionDefaults("defaults");
   EXPECT_THAT(defaults, EqualsProto(R"pb(
-                defaults {
-                  edition: EDITION_LEGACY
-                  overridable_features {}
-                  fixed_features {
-                    field_presence: EXPLICIT
-                    enum_type: CLOSED
-                    repeated_field_encoding: EXPANDED
-                    utf8_validation: NONE
-                    message_encoding: LENGTH_PREFIXED
-                    json_format: LEGACY_BEST_EFFORT
-                    enforce_naming_style: STYLE_LEGACY
-                    default_symbol_visibility: EXPORT_ALL
-                  }
-                }
-                defaults {
-                  edition: EDITION_PROTO3
-                  overridable_features {}
-                  fixed_features {
-                    field_presence: IMPLICIT
-                    enum_type: OPEN
-                    repeated_field_encoding: PACKED
-                    utf8_validation: VERIFY
-                    message_encoding: LENGTH_PREFIXED
-                    json_format: ALLOW
-                    enforce_naming_style: STYLE_LEGACY
-                    default_symbol_visibility: EXPORT_ALL
-                  }
-                }
-                defaults {
-                  edition: EDITION_2023
-                  overridable_features {
-                    field_presence: EXPLICIT
-                    enum_type: OPEN
-                    repeated_field_encoding: PACKED
-                    utf8_validation: VERIFY
-                    message_encoding: LENGTH_PREFIXED
-                    json_format: ALLOW
-                  }
-                  fixed_features {
-                    enforce_naming_style: STYLE_LEGACY
-                    default_symbol_visibility: EXPORT_ALL
-                  }
-                }
-                minimum_edition: EDITION_PROTO2
-                maximum_edition: EDITION_2023
-              )pb"));
+    defaults {
+      edition: EDITION_LEGACY
+      overridable_features {}
+      fixed_features {
+        field_presence: EXPLICIT
+        enum_type: CLOSED
+        repeated_field_encoding: EXPANDED
+        utf8_validation: NONE
+        message_encoding: LENGTH_PREFIXED
+        json_format: LEGACY_BEST_EFFORT
+        enforce_naming_style: STYLE_LEGACY
+        default_symbol_visibility: EXPORT_ALL
+      }
+    }
+    defaults {
+      edition: EDITION_PROTO3
+      overridable_features {}
+      fixed_features {
+        field_presence: IMPLICIT
+        enum_type: OPEN
+        repeated_field_encoding: PACKED
+        utf8_validation: VERIFY
+        message_encoding: LENGTH_PREFIXED
+        json_format: ALLOW
+        enforce_naming_style: STYLE_LEGACY
+        default_symbol_visibility: EXPORT_ALL
+      }
+    }
+    defaults {
+      edition: EDITION_2023
+      overridable_features {
+        field_presence: EXPLICIT
+        enum_type: OPEN
+        repeated_field_encoding: PACKED
+        utf8_validation: VERIFY
+        message_encoding: LENGTH_PREFIXED
+        json_format: ALLOW
+      }
+      fixed_features {
+        enforce_naming_style: STYLE_LEGACY
+        default_symbol_visibility: EXPORT_ALL
+      }
+    }
+    defaults {
+      edition: EDITION_2024
+      overridable_features {
+        field_presence: EXPLICIT
+        enum_type: OPEN
+        repeated_field_encoding: PACKED
+        utf8_validation: VERIFY
+        message_encoding: LENGTH_PREFIXED
+        json_format: ALLOW
+        enforce_naming_style: STYLE2024
+        default_symbol_visibility: EXPORT_TOP_LEVEL
+      }
+      fixed_features {}
+    }
+    minimum_edition: EDITION_PROTO2
+    maximum_edition: EDITION_2024
+  )pb"));
 }
 
 TEST_F(CommandLineInterfaceTest, EditionDefaultsWithMaximum) {
diff --git a/src/google/protobuf/compiler/cpp/generator.h b/src/google/protobuf/compiler/cpp/generator.h
@@ -84,7 +84,9 @@ class PROTOC_EXPORT CppGenerator final : public CodeGenerator {
   }
 
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
 
   std::vector<const FieldDescriptor*> GetFeatureExtensions() const override {
     return {GetExtensionReflection(pb::cpp)};
diff --git a/src/google/protobuf/compiler/csharp/csharp_generator.h b/src/google/protobuf/compiler/csharp/csharp_generator.h
@@ -36,7 +36,9 @@ class PROTOC_EXPORT Generator : public CodeGenerator {
     std::string* error) const override;
   uint64_t GetSupportedFeatures() const override;
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
   using CodeGenerator::GetEdition;
 };
 
diff --git a/src/google/protobuf/compiler/java/generator.h b/src/google/protobuf/compiler/java/generator.h
@@ -49,7 +49,9 @@ class PROTOC_EXPORT JavaGenerator : public CodeGenerator {
   uint64_t GetSupportedFeatures() const override;
 
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
 
   std::vector<const FieldDescriptor*> GetFeatureExtensions() const override {
     return {GetExtensionReflection(pb::java)};
diff --git a/src/google/protobuf/compiler/java/plugin_unittest.cc b/src/google/protobuf/compiler/java/plugin_unittest.cc
@@ -57,7 +57,9 @@ class TestGenerator : public CodeGenerator {
   }
 
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
 };
 
 // This test verifies that all the expected insertion points exist.  It does
diff --git a/src/google/protobuf/compiler/kotlin/generator.h b/src/google/protobuf/compiler/kotlin/generator.h
@@ -44,7 +44,9 @@ class PROTOC_EXPORT KotlinGenerator : public CodeGenerator {
   uint64_t GetSupportedFeatures() const override;
 
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
 
   std::vector<const FieldDescriptor*> GetFeatureExtensions() const override {
     return {GetExtensionReflection(pb::java)};
diff --git a/src/google/protobuf/compiler/objectivec/generator.h b/src/google/protobuf/compiler/objectivec/generator.h
@@ -49,7 +49,9 @@ class PROTOC_EXPORT ObjectiveCGenerator final : public CodeGenerator {
     return (FEATURE_PROTO3_OPTIONAL | FEATURE_SUPPORTS_EDITIONS);
   }
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
 };
 
 }  // namespace objectivec
diff --git a/src/google/protobuf/compiler/php/php_generator.h b/src/google/protobuf/compiler/php/php_generator.h
@@ -39,7 +39,9 @@ class PROTOC_EXPORT Generator : public CodeGenerator {
   }
 
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
   std::vector<const FieldDescriptor*> GetFeatureExtensions() const override {
     return {};
   }
diff --git a/src/google/protobuf/compiler/python/generator.h b/src/google/protobuf/compiler/python/generator.h
@@ -70,7 +70,9 @@ class PROTOC_EXPORT Generator : public CodeGenerator {
            Feature::FEATURE_SUPPORTS_EDITIONS;
   }
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
   std::vector<const FieldDescriptor*> GetFeatureExtensions() const override {
     return {};
   }
diff --git a/src/google/protobuf/compiler/python/pyi_generator.h b/src/google/protobuf/compiler/python/pyi_generator.h
@@ -56,7 +56,9 @@ class PROTOC_EXPORT PyiGenerator : public google::protobuf::compiler::CodeGenera
                 std::string* error) const override;
 
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
   std::vector<const FieldDescriptor*> GetFeatureExtensions() const override {
     return {};
   }
diff --git a/src/google/protobuf/compiler/ruby/ruby_generator.h b/src/google/protobuf/compiler/ruby/ruby_generator.h
@@ -34,7 +34,9 @@ class PROTOC_EXPORT Generator : public CodeGenerator {
            Feature::FEATURE_SUPPORTS_EDITIONS;
   }
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
 };
 
 }  // namespace ruby
diff --git a/src/google/protobuf/compiler/rust/generator.h b/src/google/protobuf/compiler/rust/generator.h
@@ -37,7 +37,9 @@ class PROTOC_EXPORT RustGenerator final
     return FEATURE_PROTO3_OPTIONAL | FEATURE_SUPPORTS_EDITIONS;
   }
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
-  Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
+  Edition GetMaximumEdition() const override {
+    return Edition::EDITION_2024;
+  }
 };
 
 }  // namespace rust
