Commit e664aa6d authored by Thomas Van Lenten's avatar Thomas Van Lenten

Regenerate the WKT to pick up current changes to the proto files.

parent 3633bcd5
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CF_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
...@@ -33,8 +36,36 @@ typedef GPB_ENUM(GPBAny_FieldNumber) { ...@@ -33,8 +36,36 @@ typedef GPB_ENUM(GPBAny_FieldNumber) {
GPBAny_FieldNumber_Value = 2, GPBAny_FieldNumber_Value = 2,
}; };
/// `Any` contains an arbitrary serialized message along with a URL /// `Any` contains an arbitrary serialized protocol buffer message along with a
/// that describes the type of the serialized message. /// URL that describes the type of the serialized message.
///
/// Protobuf library provides support to pack/unpack Any values in the form
/// of utility functions or additional generated methods of the Any type.
///
/// Example 1: Pack and unpack a message in C++.
///
/// Foo foo = ...;
/// Any any;
/// any.PackFrom(foo);
/// ...
/// if (any.UnpackTo(&foo)) {
/// ...
/// }
///
/// Example 2: Pack and unpack a message in Java.
///
/// Foo foo = ...;
/// Any any = Any.pack(foo);
/// ...
/// if (any.is(Foo.class)) {
/// foo = any.unpack(Foo.class);
/// }
///
/// The pack methods provided by protobuf library will by default use
/// 'type.googleapis.com/full.type.name' as the type URL and the unpack
/// methods only use the fully qualified type name after the last '/'
/// in the type URL, for example "foo.bar.com/x/y.z" will yield type
/// name "y.z".
/// ///
/// ///
/// JSON /// JSON
...@@ -67,7 +98,7 @@ typedef GPB_ENUM(GPBAny_FieldNumber) { ...@@ -67,7 +98,7 @@ typedef GPB_ENUM(GPBAny_FieldNumber) {
@interface GPBAny : GPBMessage @interface GPBAny : GPBMessage
/// A URL/resource name whose content describes the type of the /// A URL/resource name whose content describes the type of the
/// serialized message. /// serialized protocol buffer message.
/// ///
/// For URLs which use the schema `http`, `https`, or no schema, the /// For URLs which use the schema `http`, `https`, or no schema, the
/// following restrictions and interpretations apply: /// following restrictions and interpretations apply:
...@@ -87,7 +118,7 @@ typedef GPB_ENUM(GPBAny_FieldNumber) { ...@@ -87,7 +118,7 @@ typedef GPB_ENUM(GPBAny_FieldNumber) {
/// used with implementation specific semantics. /// used with implementation specific semantics.
@property(nonatomic, readwrite, copy, null_resettable) NSString *typeURL; @property(nonatomic, readwrite, copy, null_resettable) NSString *typeURL;
/// Must be valid serialized data of the above specified type. /// Must be a valid serialized protocol buffer of the above specified type.
@property(nonatomic, readwrite, copy, null_resettable) NSData *value; @property(nonatomic, readwrite, copy, null_resettable) NSData *value;
@end @end
...@@ -96,4 +127,6 @@ NS_ASSUME_NONNULL_END ...@@ -96,4 +127,6 @@ NS_ASSUME_NONNULL_END
CF_EXTERN_C_END CF_EXTERN_C_END
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
#import "google/protobuf/Any.pbobjc.h" #import "google/protobuf/Any.pbobjc.h"
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma mark - GPBAnyRoot #pragma mark - GPBAnyRoot
@implementation GPBAnyRoot @implementation GPBAnyRoot
...@@ -85,4 +88,6 @@ typedef struct GPBAny__storage_ { ...@@ -85,4 +88,6 @@ typedef struct GPBAny__storage_ {
@end @end
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CF_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
@class GPBMethod; @class GPBMethod;
...@@ -254,4 +257,6 @@ NS_ASSUME_NONNULL_END ...@@ -254,4 +257,6 @@ NS_ASSUME_NONNULL_END
CF_EXTERN_C_END CF_EXTERN_C_END
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
#import "google/protobuf/Type.pbobjc.h" #import "google/protobuf/Type.pbobjc.h"
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma mark - GPBApiRoot #pragma mark - GPBApiRoot
@implementation GPBApiRoot @implementation GPBApiRoot
...@@ -340,4 +343,6 @@ typedef struct GPBMixin__storage_ { ...@@ -340,4 +343,6 @@ typedef struct GPBMixin__storage_ {
@end @end
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CF_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
...@@ -93,4 +96,6 @@ NS_ASSUME_NONNULL_END ...@@ -93,4 +96,6 @@ NS_ASSUME_NONNULL_END
CF_EXTERN_C_END CF_EXTERN_C_END
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
#import "google/protobuf/Duration.pbobjc.h" #import "google/protobuf/Duration.pbobjc.h"
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma mark - GPBDurationRoot #pragma mark - GPBDurationRoot
@implementation GPBDurationRoot @implementation GPBDurationRoot
...@@ -80,4 +83,6 @@ typedef struct GPBDuration__storage_ { ...@@ -80,4 +83,6 @@ typedef struct GPBDuration__storage_ {
@end @end
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CF_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
...@@ -45,4 +48,6 @@ NS_ASSUME_NONNULL_END ...@@ -45,4 +48,6 @@ NS_ASSUME_NONNULL_END
CF_EXTERN_C_END CF_EXTERN_C_END
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
#import "google/protobuf/Empty.pbobjc.h" #import "google/protobuf/Empty.pbobjc.h"
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma mark - GPBEmptyRoot #pragma mark - GPBEmptyRoot
@implementation GPBEmptyRoot @implementation GPBEmptyRoot
...@@ -56,4 +59,6 @@ typedef struct GPBEmpty__storage_ { ...@@ -56,4 +59,6 @@ typedef struct GPBEmpty__storage_ {
@end @end
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CF_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
...@@ -154,6 +157,33 @@ typedef GPB_ENUM(GPBFieldMask_FieldNumber) { ...@@ -154,6 +157,33 @@ typedef GPB_ENUM(GPBFieldMask_FieldNumber) {
/// { /// {
/// mask: "user.displayName,photo" /// mask: "user.displayName,photo"
/// } /// }
///
/// # Field Masks and Oneof Fields
///
/// Field masks treat fields in oneofs just as regular fields. Consider the
/// following message:
///
/// message SampleMessage {
/// oneof test_oneof {
/// string name = 4;
/// SubMessage sub_message = 9;
/// }
/// }
///
/// The field mask can be:
///
/// mask {
/// paths: "name"
/// }
///
/// Or:
///
/// mask {
/// paths: "sub_message"
/// }
///
/// Note that oneof type names ("test_oneof" in this case) cannot be used in
/// paths.
@interface GPBFieldMask : GPBMessage @interface GPBFieldMask : GPBMessage
/// The set of field mask paths. /// The set of field mask paths.
...@@ -167,4 +197,6 @@ NS_ASSUME_NONNULL_END ...@@ -167,4 +197,6 @@ NS_ASSUME_NONNULL_END
CF_EXTERN_C_END CF_EXTERN_C_END
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
#import "google/protobuf/FieldMask.pbobjc.h" #import "google/protobuf/FieldMask.pbobjc.h"
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma mark - GPBFieldMaskRoot #pragma mark - GPBFieldMaskRoot
@implementation GPBFieldMaskRoot @implementation GPBFieldMaskRoot
...@@ -69,4 +72,6 @@ typedef struct GPBFieldMask__storage_ { ...@@ -69,4 +72,6 @@ typedef struct GPBFieldMask__storage_ {
@end @end
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CF_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
...@@ -46,4 +49,6 @@ NS_ASSUME_NONNULL_END ...@@ -46,4 +49,6 @@ NS_ASSUME_NONNULL_END
CF_EXTERN_C_END CF_EXTERN_C_END
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
#import "google/protobuf/SourceContext.pbobjc.h" #import "google/protobuf/SourceContext.pbobjc.h"
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma mark - GPBSourceContextRoot #pragma mark - GPBSourceContextRoot
@implementation GPBSourceContextRoot @implementation GPBSourceContextRoot
...@@ -69,4 +72,6 @@ typedef struct GPBSourceContext__storage_ { ...@@ -69,4 +72,6 @@ typedef struct GPBSourceContext__storage_ {
@end @end
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CF_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
@class GPBListValue; @class GPBListValue;
...@@ -67,7 +70,7 @@ typedef GPB_ENUM(GPBStruct_FieldNumber) { ...@@ -67,7 +70,7 @@ typedef GPB_ENUM(GPBStruct_FieldNumber) {
/// The JSON representation for `Struct` is JSON object. /// The JSON representation for `Struct` is JSON object.
@interface GPBStruct : GPBMessage @interface GPBStruct : GPBMessage
/// Map of dynamically typed values. /// Unordered map of dynamically typed values.
@property(nonatomic, readwrite, strong, null_resettable) NSMutableDictionary<NSString*, GPBValue*> *fields; @property(nonatomic, readwrite, strong, null_resettable) NSMutableDictionary<NSString*, GPBValue*> *fields;
/// The number of items in @c fields without causing the array to be created. /// The number of items in @c fields without causing the array to be created.
@property(nonatomic, readonly) NSUInteger fields_Count; @property(nonatomic, readonly) NSUInteger fields_Count;
...@@ -159,4 +162,6 @@ NS_ASSUME_NONNULL_END ...@@ -159,4 +162,6 @@ NS_ASSUME_NONNULL_END
CF_EXTERN_C_END CF_EXTERN_C_END
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
#import "google/protobuf/Struct.pbobjc.h" #import "google/protobuf/Struct.pbobjc.h"
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma mark - GPBStructRoot #pragma mark - GPBStructRoot
@implementation GPBStructRoot @implementation GPBStructRoot
...@@ -265,4 +268,6 @@ typedef struct GPBListValue__storage_ { ...@@ -265,4 +268,6 @@ typedef struct GPBListValue__storage_ {
@end @end
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CF_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
...@@ -105,4 +108,6 @@ NS_ASSUME_NONNULL_END ...@@ -105,4 +108,6 @@ NS_ASSUME_NONNULL_END
CF_EXTERN_C_END CF_EXTERN_C_END
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
#import "google/protobuf/Timestamp.pbobjc.h" #import "google/protobuf/Timestamp.pbobjc.h"
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma mark - GPBTimestampRoot #pragma mark - GPBTimestampRoot
@implementation GPBTimestampRoot @implementation GPBTimestampRoot
...@@ -80,4 +83,6 @@ typedef struct GPBTimestamp__storage_ { ...@@ -80,4 +83,6 @@ typedef struct GPBTimestamp__storage_ {
@end @end
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CF_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
@class GPBAny; @class GPBAny;
...@@ -365,4 +368,6 @@ NS_ASSUME_NONNULL_END ...@@ -365,4 +368,6 @@ NS_ASSUME_NONNULL_END
CF_EXTERN_C_END CF_EXTERN_C_END
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
#import "google/protobuf/SourceContext.pbobjc.h" #import "google/protobuf/SourceContext.pbobjc.h"
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma mark - GPBTypeRoot #pragma mark - GPBTypeRoot
@implementation GPBTypeRoot @implementation GPBTypeRoot
...@@ -685,4 +688,6 @@ typedef struct GPBOption__storage_ { ...@@ -685,4 +688,6 @@ typedef struct GPBOption__storage_ {
@end @end
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CF_EXTERN_C_BEGIN CF_EXTERN_C_BEGIN
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
...@@ -174,4 +177,6 @@ NS_ASSUME_NONNULL_END ...@@ -174,4 +177,6 @@ NS_ASSUME_NONNULL_END
CF_EXTERN_C_END CF_EXTERN_C_END
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
#import "google/protobuf/Wrappers.pbobjc.h" #import "google/protobuf/Wrappers.pbobjc.h"
// @@protoc_insertion_point(imports) // @@protoc_insertion_point(imports)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#pragma mark - GPBWrappersRoot #pragma mark - GPBWrappersRoot
@implementation GPBWrappersRoot @implementation GPBWrappersRoot
...@@ -412,4 +415,6 @@ typedef struct GPBBytesValue__storage_ { ...@@ -412,4 +415,6 @@ typedef struct GPBBytesValue__storage_ {
@end @end
#pragma clang diagnostic pop
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment