Skip to content

Commit 99e193e

Browse files
lfolgergopherbot
lfolger
authored and
gopherbot
committed
all: update to protobuf-26.0-rc2 to implement go edition features
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]>
1 parent 82c6b3a commit 99e193e

7 files changed

Lines changed: 715 additions & 670 deletions

File tree

‎integration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var (
3535
regenerate = flag.Bool("regenerate", false, "regenerate files")
3636
buildRelease = flag.Bool("buildRelease", false, "build release binaries")
3737

38-
protobufVersion = "25.1"
38+
protobufVersion = "26.0-rc2"
3939

4040
golangVersions = func() []string {
4141
// Version policy: same version as is in the x/ repos' go.mod.

‎internal/genid/descriptor_gen.go‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎reflect/protodesc/editions_defaults.binpb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

2-
  (0�
2+
  (0�
33
  (0�
44
  (0� �(�

‎reflect/protodesc/proto/go_features.proto‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Protocol Buffers - Google's data interchange format
2+
// Copyright 2023 Google Inc. All rights reserved.
3+
//
4+
// Use of this source code is governed by a BSD-style
5+
// license that can be found in the LICENSE file or at
6+
// https://developers.google.com/open-source/licenses/bsd
7+
8+
syntax = "proto2";
9+
10+
package google.protobuf;
11+
12+
import "google/protobuf/descriptor.proto";
13+
14+
extend google.protobuf.FeatureSet {
15+
optional GoFeatures go = 1002;
16+
}
17+
18+
message GoFeatures {
19+
// Whether or not to generate the deprecated UnmarshalJSON method for enums.
20+
// BEGIN GOOGLE-INTERNAL
21+
// Can only be true for proto using the OPEN_V1 api.
22+
// END GOOGLE-INTERNAL
23+
optional bool legacy_unmarshal_json_enum = 1 [
24+
retention = RETENTION_RUNTIME,
25+
targets = TARGET_TYPE_ENUM,
26+
edition_defaults = { edition: EDITION_PROTO2, value: "true" },
27+
edition_defaults = { edition: EDITION_PROTO3, value: "false" }
28+
];
29+
}

‎reflect/protoreflect/source_gen.go‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)