Skip to content

Commit

Permalink
all: update to protobuf-26.0-rc2 to implement go edition features
Browse files Browse the repository at this point in the history
Change-Id: I190b1550e3e2e630392fed155716af9d651c74bc
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/562615
LUCI-TryBot-Result: Go LUCI <[email protected]>
Reviewed-by: Michael Stapelberg <[email protected]>
Auto-Submit: Lasse Folger <[email protected]>
  • Loading branch information
lfolger authored and gopherbot committed Feb 8, 2024
1 parent 82c6b3a commit 99e193e
Show file tree
Hide file tree
Showing 7 changed files with 715 additions and 670 deletions.
2 changes: 1 addition & 1 deletion integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var (
regenerate = flag.Bool("regenerate", false, "regenerate files")
buildRelease = flag.Bool("buildRelease", false, "build release binaries")

protobufVersion = "25.1"
protobufVersion = "26.0-rc2"

golangVersions = func() []string {
// Version policy: same version as is in the x/ repos' go.mod.
Expand Down
3 changes: 0 additions & 3 deletions internal/genid/descriptor_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion reflect/protodesc/editions_defaults.binpb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

  (0�
  (0�
  (0�
  (0� �(�
29 changes: 29 additions & 0 deletions reflect/protodesc/proto/go_features.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2023 Google Inc. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd

syntax = "proto2";

package google.protobuf;

import "google/protobuf/descriptor.proto";

extend google.protobuf.FeatureSet {
optional GoFeatures go = 1002;
}

message GoFeatures {
// Whether or not to generate the deprecated UnmarshalJSON method for enums.
// BEGIN GOOGLE-INTERNAL
// Can only be true for proto using the OPEN_V1 api.
// END GOOGLE-INTERNAL
optional bool legacy_unmarshal_json_enum = 1 [
retention = RETENTION_RUNTIME,
targets = TARGET_TYPE_ENUM,
edition_defaults = { edition: EDITION_PROTO2, value: "true" },
edition_defaults = { edition: EDITION_PROTO3, value: "false" }
];
}
2 changes: 0 additions & 2 deletions reflect/protoreflect/source_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 99e193e

Please sign in to comment.