Skip to content

Commit 882cf97

Browse files
authored
all: update to v3.6.1 (#757)
Update all proto files that is obtained from the upstream repository to v3.6.1.
1 parent 5213254 commit 882cf97

File tree

7 files changed

+233
-184
lines changed

7 files changed

+233
-184
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ go:
99
install:
1010
- go get -v -d google.golang.org/grpc
1111
- go get -v -d -t github.com/golang/protobuf/...
12-
- curl -L https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip -o /tmp/protoc.zip
12+
- curl -L https://github.com/google/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip -o /tmp/protoc.zip
1313
- unzip /tmp/protoc.zip -d "$HOME"/protoc
1414
- mkdir -p "$HOME"/src && ln -s "$HOME"/protoc "$HOME"/src/protobuf
1515

protoc-gen-go/descriptor/descriptor.pb.go

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

protoc-gen-go/descriptor/descriptor.proto

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,17 @@ message FileOptions {
417417
// determining the namespace.
418418
optional string php_namespace = 41;
419419

420+
421+
// Use this option to change the namespace of php generated metadata classes.
422+
// Default is empty. When this option is empty, the proto file name will be used
423+
// for determining the namespace.
424+
optional string php_metadata_namespace = 44;
425+
426+
// Use this option to change the package of ruby generated classes. Default
427+
// is empty. When this option is not set, the package name will be used for
428+
// determining the ruby package.
429+
optional string ruby_package = 45;
430+
420431
// The parser stores options it doesn't recognize here.
421432
// See the documentation for the "Options" section above.
422433
repeated UninterpretedOption uninterpreted_option = 999;

ptypes/any/any.pb.go

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

ptypes/any/any.proto

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,18 @@ option objc_class_prefix = "GPB";
120120
// }
121121
//
122122
message Any {
123-
// A URL/resource name whose content describes the type of the
124-
// serialized protocol buffer message.
123+
// A URL/resource name that uniquely identifies the type of the serialized
124+
// protocol buffer message. The last segment of the URL's path must represent
125+
// the fully qualified name of the type (as in
126+
// `path/google.protobuf.Duration`). The name should be in a canonical form
127+
// (e.g., leading "." is not accepted).
125128
//
126-
// For URLs which use the scheme `http`, `https`, or no scheme, the
127-
// following restrictions and interpretations apply:
129+
// In practice, teams usually precompile into the binary all types that they
130+
// expect it to use in the context of Any. However, for URLs which use the
131+
// scheme `http`, `https`, or no scheme, one can optionally set up a type
132+
// server that maps type URLs to message definitions as follows:
128133
//
129134
// * If no scheme is provided, `https` is assumed.
130-
// * The last segment of the URL's path must represent the fully
131-
// qualified name of the type (as in `path/google.protobuf.Duration`).
132-
// The name should be in a canonical form (e.g., leading "." is
133-
// not accepted).
134135
// * An HTTP GET on the URL must yield a [google.protobuf.Type][]
135136
// value in binary format, or produce an error.
136137
// * Applications are allowed to cache lookup results based on the
@@ -139,6 +140,10 @@ message Any {
139140
// on changes to types. (Use versioned type names to manage
140141
// breaking changes.)
141142
//
143+
// Note: this functionality is not currently available in the official
144+
// protobuf release, and it is not used for type URLs beginning with
145+
// type.googleapis.com.
146+
//
142147
// Schemes other than `http`, `https` (or the empty scheme) might be
143148
// used with implementation specific semantics.
144149
//

ptypes/timestamp/timestamp.pb.go

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

ptypes/timestamp/timestamp.proto

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ option objc_class_prefix = "GPB";
103103
// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
104104
// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
105105
// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
106-
// is required, though only UTC (as indicated by "Z") is presently supported.
106+
// is required. A proto3 JSON serializer should always use UTC (as indicated by
107+
// "Z") when printing the Timestamp type and a proto3 JSON parser should be
108+
// able to accept both UTC and other timezones (as indicated by an offset).
107109
//
108110
// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
109111
// 01:30 UTC on January 15, 2017.
@@ -114,8 +116,8 @@ option objc_class_prefix = "GPB";
114116
// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime)
115117
// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one
116118
// can use the Joda Time's [`ISODateTimeFormat.dateTime()`](
117-
// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--)
118-
// to obtain a formatter capable of generating timestamps in this format.
119+
// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--
120+
// ) to obtain a formatter capable of generating timestamps in this format.
119121
//
120122
//
121123
message Timestamp {

0 commit comments

Comments
 (0)