From c2cb9f4f85b8de867638343fe8b85f6df13b477b Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Mon, 23 Oct 2017 12:26:51 +0300 Subject: [PATCH] 3.0.26 --- ProtocolBuffers-Swift.podspec | 2 +- ...oogle.Protobuf.SwiftDescriptor.proto.swift | 6 ++--- .../google/protobuf/swift-descriptor.pb.cc | 24 +++++++++---------- .../google/protobuf/swift-descriptor.pb.h | 6 ++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ProtocolBuffers-Swift.podspec b/ProtocolBuffers-Swift.podspec index 45c5f04..f6168f3 100644 --- a/ProtocolBuffers-Swift.podspec +++ b/ProtocolBuffers-Swift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "ProtocolBuffers-Swift" - s.version = "3.0.25" + s.version = "3.0.26" s.summary = "Protocol Buffers for Swift" s.homepage = "http://protobuf.io#swift" s.license = "Apache 2.0" diff --git a/Source/Google.Protobuf.SwiftDescriptor.proto.swift b/Source/Google.Protobuf.SwiftDescriptor.proto.swift index b06841b..175edd5 100644 --- a/Source/Google.Protobuf.SwiftDescriptor.proto.swift +++ b/Source/Google.Protobuf.SwiftDescriptor.proto.swift @@ -38,9 +38,9 @@ public extension Google.Protobuf { init() { SwiftDescriptorRootswiftFileOptionsStatic = ConcreateExtensionField(type:ExtensionType.extensionTypeMessage, extendedClass:Google.Protobuf.FileOptions.self, fieldNumber: 5100987, defaultValue:Google.Protobuf.SwiftFileOptions(), messageOrGroupClass:Google.Protobuf.SwiftFileOptions.self, isRepeated:false, isPacked:false, isMessageSetWireFormat:false) - SwiftDescriptorRootswiftFieldOptionsStatic = ConcreateExtensionField(type:ExtensionType.extensionTypeMessage, extendedClass:Google.Protobuf.FieldOptions.self, fieldNumber: 510986, defaultValue:Google.Protobuf.SwiftFieldOptions(), messageOrGroupClass:Google.Protobuf.SwiftFieldOptions.self, isRepeated:false, isPacked:false, isMessageSetWireFormat:false) - SwiftDescriptorRootswiftMessageOptionsStatic = ConcreateExtensionField(type:ExtensionType.extensionTypeMessage, extendedClass:Google.Protobuf.MessageOptions.self, fieldNumber: 510985, defaultValue:Google.Protobuf.SwiftMessageOptions(), messageOrGroupClass:Google.Protobuf.SwiftMessageOptions.self, isRepeated:false, isPacked:false, isMessageSetWireFormat:false) - SwiftDescriptorRootswiftEnumOptionsStatic = ConcreateExtensionField(type:ExtensionType.extensionTypeMessage, extendedClass:Google.Protobuf.EnumOptions.self, fieldNumber: 510984, defaultValue:Google.Protobuf.SwiftEnumOptions(), messageOrGroupClass:Google.Protobuf.SwiftEnumOptions.self, isRepeated:false, isPacked:false, isMessageSetWireFormat:false) + SwiftDescriptorRootswiftFieldOptionsStatic = ConcreateExtensionField(type:ExtensionType.extensionTypeMessage, extendedClass:Google.Protobuf.FieldOptions.self, fieldNumber: 5100986, defaultValue:Google.Protobuf.SwiftFieldOptions(), messageOrGroupClass:Google.Protobuf.SwiftFieldOptions.self, isRepeated:false, isPacked:false, isMessageSetWireFormat:false) + SwiftDescriptorRootswiftMessageOptionsStatic = ConcreateExtensionField(type:ExtensionType.extensionTypeMessage, extendedClass:Google.Protobuf.MessageOptions.self, fieldNumber: 5100985, defaultValue:Google.Protobuf.SwiftMessageOptions(), messageOrGroupClass:Google.Protobuf.SwiftMessageOptions.self, isRepeated:false, isPacked:false, isMessageSetWireFormat:false) + SwiftDescriptorRootswiftEnumOptionsStatic = ConcreateExtensionField(type:ExtensionType.extensionTypeMessage, extendedClass:Google.Protobuf.EnumOptions.self, fieldNumber: 5100984, defaultValue:Google.Protobuf.SwiftEnumOptions(), messageOrGroupClass:Google.Protobuf.SwiftEnumOptions.self, isRepeated:false, isPacked:false, isMessageSetWireFormat:false) extensionRegistry = ExtensionRegistry() registerAllExtensions(registry: extensionRegistry) Google.Protobuf.DescriptorRoot.default.registerAllExtensions(registry: extensionRegistry) diff --git a/plugin/compiler/google/protobuf/swift-descriptor.pb.cc b/plugin/compiler/google/protobuf/swift-descriptor.pb.cc index d3a1077..607b97a 100644 --- a/plugin/compiler/google/protobuf/swift-descriptor.pb.cc +++ b/plugin/compiler/google/protobuf/swift-descriptor.pb.cc @@ -176,15 +176,15 @@ void TableStruct::InitDefaultsImpl() { ::google::protobuf::SwiftFileOptions::internal_default_instance()); ::google::protobuf::internal::ExtensionSet::RegisterMessageExtension( ::google::protobuf::FieldOptions::internal_default_instance(), - 510986, 11, false, false, + 5100986, 11, false, false, ::google::protobuf::SwiftFieldOptions::internal_default_instance()); ::google::protobuf::internal::ExtensionSet::RegisterMessageExtension( ::google::protobuf::MessageOptions::internal_default_instance(), - 510985, 11, false, false, + 5100985, 11, false, false, ::google::protobuf::SwiftMessageOptions::internal_default_instance()); ::google::protobuf::internal::ExtensionSet::RegisterMessageExtension( ::google::protobuf::EnumOptions::internal_default_instance(), - 510984, 11, false, false, + 5100984, 11, false, false, ::google::protobuf::SwiftEnumOptions::internal_default_instance()); } @@ -221,18 +221,18 @@ void AddDescriptorsImpl() { "\n\025RealmOverrideRepeated\022\014\n\010OVERRIDE\020\000\022\n\n" "\006APPEND\020\001:^\n\022swift_file_options\022\034.google" ".protobuf.FileOptions\030\273\253\267\002 \001(\0132!.google." - "protobuf.SwiftFileOptions:`\n\023swift_field" + "protobuf.SwiftFileOptions:a\n\023swift_field" "_options\022\035.google.protobuf.FieldOptions\030" - "\212\230\037 \001(\0132\".google.protobuf.SwiftFieldOpti" - "ons:f\n\025swift_message_options\022\037.google.pr" - "otobuf.MessageOptions\030\211\230\037 \001(\0132$.google.p" - "rotobuf.SwiftMessageOptions:]\n\022swift_enu" - "m_options\022\034.google.protobuf.EnumOptions\030" - "\210\230\037 \001(\0132!.google.protobuf.SwiftEnumOptio" - "nsB\016\332\333\272\023\002\030\000\332\333\272\023\002\020\001" + "\272\253\267\002 \001(\0132\".google.protobuf.SwiftFieldOpt" + "ions:g\n\025swift_message_options\022\037.google.p" + "rotobuf.MessageOptions\030\271\253\267\002 \001(\0132$.google" + ".protobuf.SwiftMessageOptions:^\n\022swift_e" + "num_options\022\034.google.protobuf.EnumOption" + "s\030\270\253\267\002 \001(\0132!.google.protobuf.SwiftEnumOp" + "tionsB\016\332\333\272\023\002\030\000\332\333\272\023\002\020\001" }; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - descriptor, 1338); + descriptor, 1341); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/swift-descriptor.proto", &protobuf_RegisterTypes); ::google::protobuf::protobuf_google_2fprotobuf_2fdescriptor_2eproto::AddDescriptors(); diff --git a/plugin/compiler/google/protobuf/swift-descriptor.pb.h b/plugin/compiler/google/protobuf/swift-descriptor.pb.h index f562c04..8193f5f 100644 --- a/plugin/compiler/google/protobuf/swift-descriptor.pb.h +++ b/plugin/compiler/google/protobuf/swift-descriptor.pb.h @@ -679,15 +679,15 @@ static const int kSwiftFileOptionsFieldNumber = 5100987; extern ::google::protobuf::internal::ExtensionIdentifier< ::google::protobuf::FileOptions, ::google::protobuf::internal::MessageTypeTraits< ::google::protobuf::SwiftFileOptions >, 11, false > swift_file_options; -static const int kSwiftFieldOptionsFieldNumber = 510986; +static const int kSwiftFieldOptionsFieldNumber = 5100986; extern ::google::protobuf::internal::ExtensionIdentifier< ::google::protobuf::FieldOptions, ::google::protobuf::internal::MessageTypeTraits< ::google::protobuf::SwiftFieldOptions >, 11, false > swift_field_options; -static const int kSwiftMessageOptionsFieldNumber = 510985; +static const int kSwiftMessageOptionsFieldNumber = 5100985; extern ::google::protobuf::internal::ExtensionIdentifier< ::google::protobuf::MessageOptions, ::google::protobuf::internal::MessageTypeTraits< ::google::protobuf::SwiftMessageOptions >, 11, false > swift_message_options; -static const int kSwiftEnumOptionsFieldNumber = 510984; +static const int kSwiftEnumOptionsFieldNumber = 5100984; extern ::google::protobuf::internal::ExtensionIdentifier< ::google::protobuf::EnumOptions, ::google::protobuf::internal::MessageTypeTraits< ::google::protobuf::SwiftEnumOptions >, 11, false > swift_enum_options;