Skip to content

Commit

Permalink
Merge pull request #3168 from square/bquenaudon.2024-11-05.des
Browse files Browse the repository at this point in the history
Bumping descriptor.proto
  • Loading branch information
oldergod authored Nov 5, 2024
2 parents c5c0dfe + 26e954f commit ec51df1
Showing 1 changed file with 16 additions and 5 deletions.
21 changes: 16 additions & 5 deletions wire-schema/src/jvmMain/resources/google/protobuf/descriptor.proto
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ option optimize_for = SPEED;
// files it parses.
message FileDescriptorSet {
repeated FileDescriptorProto file = 1;

// Extensions for tooling.
extensions 536000000 [declaration = {
number: 536000000
type: ".buf.descriptor.v1.FileDescriptorSetExtension"
full_name: ".buf.descriptor.v1.buf_file_descriptor_set_extension"
}];
}

// The full set of known editions.
Expand All @@ -80,7 +87,7 @@ enum Edition {
EDITION_2024 = 1001;

// Placeholder editions for testing feature resolution. These should not be
// used or relyed on outside of tests.
// used or relied on outside of tests.
EDITION_1_TEST_ONLY = 1;
EDITION_2_TEST_ONLY = 2;
EDITION_99997_TEST_ONLY = 99997;
Expand Down Expand Up @@ -732,8 +739,6 @@ message FieldOptions {
optional bool debug_redact = 16 [default = false];

// If set to RETENTION_SOURCE, the option will be omitted from the binary.
// Note: as of January 2023, support for this is in progress and does not yet
// have an effect (b/264593489).
enum OptionRetention {
RETENTION_UNKNOWN = 0;
RETENTION_RUNTIME = 1;
Expand All @@ -744,8 +749,7 @@ message FieldOptions {

// This indicates the types of entities that the field may apply to when used
// as an option. If it is unset, then the field may be freely used as an
// option on any kind of entity. Note: as of January 2023, support for this is
// in progress and does not yet have an effect (b/264593489).
// option on any kind of entity.
enum OptionTargetType {
TARGET_TYPE_UNKNOWN = 0;
TARGET_TYPE_FILE = 1;
Expand Down Expand Up @@ -1255,6 +1259,13 @@ message SourceCodeInfo {
optional string trailing_comments = 4;
repeated string leading_detached_comments = 6;
}

// Extensions for tooling.
extensions 536000000 [declaration = {
number: 536000000
type: ".buf.descriptor.v1.SourceCodeInfoExtension"
full_name: ".buf.descriptor.v1.buf_source_code_info_extension"
}];
}

// Describes the relationship between generated code and its original source
Expand Down

0 comments on commit ec51df1

Please sign in to comment.