Regenerate

Author: thomasvl

Reference/google/protobuf/any.pb.swift

@@ -87,10 +87,13 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 ///  Example 4: Pack and unpack a message in Go
 ///
 ///      foo := &pb.Foo{...}
-///      any, err := ptypes.MarshalAny(foo)
+///      any, err := anypb.New(foo)
+///      if err != nil {
+///        ...
+///      }
 ///      ...
 ///      foo := &pb.Foo{}
-///      if err := ptypes.UnmarshalAny(any, foo); err != nil {
+///      if err := any.UnmarshalTo(foo); err != nil {
 ///        ...
 ///      }
 ///

Reference/google/protobuf/compiler/plugin.pb.swift

@@ -322,13 +322,26 @@ struct Google_Protobuf_Compiler_CodeGeneratorResponse {
     /// Clears the value of `content`. Subsequent reads from it will return its default value.
     mutating func clearContent() {self._content = nil}
 
+    /// Information describing the file content being inserted. If an insertion
+    /// point is used, this information will be appropriately offset and inserted
+    /// into the code generation metadata for the generated files.
+    var generatedCodeInfo: SwiftProtobuf.Google_Protobuf_GeneratedCodeInfo {
+      get {return _generatedCodeInfo ?? SwiftProtobuf.Google_Protobuf_GeneratedCodeInfo()}
+      set {_generatedCodeInfo = newValue}
+    }
+    /// Returns true if `generatedCodeInfo` has been explicitly set.
+    var hasGeneratedCodeInfo: Bool {return self._generatedCodeInfo != nil}
+    /// Clears the value of `generatedCodeInfo`. Subsequent reads from it will return its default value.
+    mutating func clearGeneratedCodeInfo() {self._generatedCodeInfo = nil}
+
     var unknownFields = SwiftProtobuf.UnknownStorage()
 
     init() {}
 
     fileprivate var _name: String? = nil
     fileprivate var _insertionPoint: String? = nil
     fileprivate var _content: String? = nil
+    fileprivate var _generatedCodeInfo: SwiftProtobuf.Google_Protobuf_GeneratedCodeInfo? = nil
   }
 
   init() {}
@@ -511,6 +524,7 @@ extension Google_Protobuf_Compiler_CodeGeneratorResponse.File: SwiftProtobuf.Mes
     1: .same(proto: "name"),
     2: .standard(proto: "insertion_point"),
     15: .same(proto: "content"),
+    16: .standard(proto: "generated_code_info"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -522,6 +536,7 @@ extension Google_Protobuf_Compiler_CodeGeneratorResponse.File: SwiftProtobuf.Mes
       case 1: try { try decoder.decodeSingularStringField(value: &self._name) }()
       case 2: try { try decoder.decodeSingularStringField(value: &self._insertionPoint) }()
       case 15: try { try decoder.decodeSingularStringField(value: &self._content) }()
+      case 16: try { try decoder.decodeSingularMessageField(value: &self._generatedCodeInfo) }()
       default: break
       }
     }
@@ -537,13 +552,17 @@ extension Google_Protobuf_Compiler_CodeGeneratorResponse.File: SwiftProtobuf.Mes
     if let v = self._content {
       try visitor.visitSingularStringField(value: v, fieldNumber: 15)
     }
+    if let v = self._generatedCodeInfo {
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 16)
+    }
     try unknownFields.traverse(visitor: &visitor)
   }
 
   static func ==(lhs: Google_Protobuf_Compiler_CodeGeneratorResponse.File, rhs: Google_Protobuf_Compiler_CodeGeneratorResponse.File) -> Bool {
     if lhs._name != rhs._name {return false}
     if lhs._insertionPoint != rhs._insertionPoint {return false}
     if lhs._content != rhs._content {return false}
+    if lhs._generatedCodeInfo != rhs._generatedCodeInfo {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }

Reference/google/protobuf/test_messages_proto3.pb.swift

@@ -661,6 +661,14 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
     set {_uniqueStorage()._oneofField = .oneofEnum(newValue)}
   }
 
+  var oneofNullValue: SwiftProtobuf.Google_Protobuf_NullValue {
+    get {
+      if case .oneofNullValue(let v)? = _storage._oneofField {return v}
+      return .nullValue
+    }
+    set {_uniqueStorage()._oneofField = .oneofNullValue(newValue)}
+  }
+
   /// Well-known types
   var optionalBoolWrapper: SwiftProtobuf.Google_Protobuf_BoolValue {
     get {return _storage._optionalBoolWrapper ?? SwiftProtobuf.Google_Protobuf_BoolValue()}
@@ -842,6 +850,11 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalValue`. Subsequent reads from it will return its default value.
   mutating func clearOptionalValue() {_uniqueStorage()._optionalValue = nil}
 
+  var optionalNullValue: SwiftProtobuf.Google_Protobuf_NullValue {
+    get {return _storage._optionalNullValue}
+    set {_uniqueStorage()._optionalNullValue = newValue}
+  }
+
   var repeatedDuration: [SwiftProtobuf.Google_Protobuf_Duration] {
     get {return _storage._repeatedDuration}
     set {_uniqueStorage()._repeatedDuration = newValue}
@@ -981,6 +994,7 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
     case oneofFloat(Float)
     case oneofDouble(Double)
     case oneofEnum(ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum)
+    case oneofNullValue(SwiftProtobuf.Google_Protobuf_NullValue)
 
   #if !swift(>=4.1)
     static func ==(lhs: ProtobufTestMessages_Proto3_TestAllTypesProto3.OneOf_OneofField, rhs: ProtobufTestMessages_Proto3_TestAllTypesProto3.OneOf_OneofField) -> Bool {
@@ -1024,6 +1038,10 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
         guard case .oneofEnum(let l) = lhs, case .oneofEnum(let r) = rhs else { preconditionFailure() }
         return l == r
       }()
+      case (.oneofNullValue, .oneofNullValue): return {
+        guard case .oneofNullValue(let l) = lhs, case .oneofNullValue(let r) = rhs else { preconditionFailure() }
+        return l == r
+      }()
       default: return false
       }
     }
@@ -1280,6 +1298,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
     117: .standard(proto: "oneof_float"),
     118: .standard(proto: "oneof_double"),
     119: .standard(proto: "oneof_enum"),
+    120: .standard(proto: "oneof_null_value"),
     201: .standard(proto: "optional_bool_wrapper"),
     202: .standard(proto: "optional_int32_wrapper"),
     203: .standard(proto: "optional_int64_wrapper"),
@@ -1304,6 +1323,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
     304: .standard(proto: "optional_struct"),
     305: .standard(proto: "optional_any"),
     306: .standard(proto: "optional_value"),
+    307: .standard(proto: "optional_null_value"),
     311: .standard(proto: "repeated_duration"),
     312: .standard(proto: "repeated_timestamp"),
     313: .standard(proto: "repeated_fieldmask"),
@@ -1448,6 +1468,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
     var _optionalStruct: SwiftProtobuf.Google_Protobuf_Struct? = nil
     var _optionalAny: SwiftProtobuf.Google_Protobuf_Any? = nil
     var _optionalValue: SwiftProtobuf.Google_Protobuf_Value? = nil
+    var _optionalNullValue: SwiftProtobuf.Google_Protobuf_NullValue = .nullValue
     var _repeatedDuration: [SwiftProtobuf.Google_Protobuf_Duration] = []
     var _repeatedTimestamp: [SwiftProtobuf.Google_Protobuf_Timestamp] = []
     var _repeatedFieldmask: [SwiftProtobuf.Google_Protobuf_FieldMask] = []
@@ -1595,6 +1616,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
       _optionalStruct = source._optionalStruct
       _optionalAny = source._optionalAny
       _optionalValue = source._optionalValue
+      _optionalNullValue = source._optionalNullValue
       _repeatedDuration = source._repeatedDuration
       _repeatedTimestamp = source._repeatedTimestamp
       _repeatedFieldmask = source._repeatedFieldmask
@@ -1786,6 +1808,12 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
           try decoder.decodeSingularEnumField(value: &v)
           if let v = v {_storage._oneofField = .oneofEnum(v)}
         }()
+        case 120: try {
+          if _storage._oneofField != nil {try decoder.handleConflictingOneOf()}
+          var v: SwiftProtobuf.Google_Protobuf_NullValue?
+          try decoder.decodeSingularEnumField(value: &v)
+          if let v = v {_storage._oneofField = .oneofNullValue(v)}
+        }()
         case 201: try { try decoder.decodeSingularMessageField(value: &_storage._optionalBoolWrapper) }()
         case 202: try { try decoder.decodeSingularMessageField(value: &_storage._optionalInt32Wrapper) }()
         case 203: try { try decoder.decodeSingularMessageField(value: &_storage._optionalInt64Wrapper) }()
@@ -1810,6 +1838,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
         case 304: try { try decoder.decodeSingularMessageField(value: &_storage._optionalStruct) }()
         case 305: try { try decoder.decodeSingularMessageField(value: &_storage._optionalAny) }()
         case 306: try { try decoder.decodeSingularMessageField(value: &_storage._optionalValue) }()
+        case 307: try { try decoder.decodeSingularEnumField(value: &_storage._optionalNullValue) }()
         case 311: try { try decoder.decodeRepeatedMessageField(value: &_storage._repeatedDuration) }()
         case 312: try { try decoder.decodeRepeatedMessageField(value: &_storage._repeatedTimestamp) }()
         case 313: try { try decoder.decodeRepeatedMessageField(value: &_storage._repeatedFieldmask) }()
@@ -2156,6 +2185,10 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
         guard case .oneofEnum(let v)? = _storage._oneofField else { preconditionFailure() }
         try visitor.visitSingularEnumField(value: v, fieldNumber: 119)
       }()
+      case .oneofNullValue?: try {
+        guard case .oneofNullValue(let v)? = _storage._oneofField else { preconditionFailure() }
+        try visitor.visitSingularEnumField(value: v, fieldNumber: 120)
+      }()
       case nil: break
       }
       if let v = _storage._optionalBoolWrapper {
@@ -2230,6 +2263,9 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
       if let v = _storage._optionalValue {
         try visitor.visitSingularMessageField(value: v, fieldNumber: 306)
       }
+      if _storage._optionalNullValue != .nullValue {
+        try visitor.visitSingularEnumField(value: _storage._optionalNullValue, fieldNumber: 307)
+      }
       if !_storage._repeatedDuration.isEmpty {
         try visitor.visitRepeatedMessageField(value: _storage._repeatedDuration, fieldNumber: 311)
       }
@@ -2430,6 +2466,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
         if _storage._optionalStruct != rhs_storage._optionalStruct {return false}
         if _storage._optionalAny != rhs_storage._optionalAny {return false}
         if _storage._optionalValue != rhs_storage._optionalValue {return false}
+        if _storage._optionalNullValue != rhs_storage._optionalNullValue {return false}
         if _storage._repeatedDuration != rhs_storage._repeatedDuration {return false}
         if _storage._repeatedTimestamp != rhs_storage._repeatedTimestamp {return false}
         if _storage._repeatedFieldmask != rhs_storage._repeatedFieldmask {return false}

Reference/google/protobuf/timestamp.pb.swift

@@ -100,7 +100,16 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 ///         .setNanos((int) ((millis % 1000) * 1000000)).build();
 ///
 ///
-/// Example 5: Compute Timestamp from current time in Python.
+/// Example 5: Compute Timestamp from Java `Instant.now()`.
+///
+///     Instant now = Instant.now();
+///
+///     Timestamp timestamp =
+///         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
+///             .setNanos(now.getNano()).build();
+///
+///
+/// Example 6: Compute Timestamp from current time in Python.
 ///
 ///     timestamp = Timestamp()
 ///     timestamp.GetCurrentTime()

Reference/google/protobuf/unittest_lite.pb.swift

@@ -751,6 +751,14 @@ struct ProtobufUnittest_TestAllTypesLite {
     set {_uniqueStorage()._oneofField = .oneofLazyNestedMessage(newValue)}
   }
 
+  var oneofNestedMessage2: ProtobufUnittest_TestAllTypesLite.NestedMessage2 {
+    get {
+      if case .oneofNestedMessage2(let v)? = _storage._oneofField {return v}
+      return ProtobufUnittest_TestAllTypesLite.NestedMessage2()
+    }
+    set {_uniqueStorage()._oneofField = .oneofNestedMessage2(newValue)}
+  }
+
   /// Tests toString for non-repeated fields with a list suffix
   var deceptivelyNamedList: Int32 {
     get {return _storage._deceptivelyNamedList ?? 0}
@@ -770,6 +778,7 @@ struct ProtobufUnittest_TestAllTypesLite {
     case oneofString(String)
     case oneofBytes(Data)
     case oneofLazyNestedMessage(ProtobufUnittest_TestAllTypesLite.NestedMessage)
+    case oneofNestedMessage2(ProtobufUnittest_TestAllTypesLite.NestedMessage2)
 
   #if !swift(>=4.1)
     static func ==(lhs: ProtobufUnittest_TestAllTypesLite.OneOf_OneofField, rhs: ProtobufUnittest_TestAllTypesLite.OneOf_OneofField) -> Bool {
@@ -797,6 +806,10 @@ struct ProtobufUnittest_TestAllTypesLite {
         guard case .oneofLazyNestedMessage(let l) = lhs, case .oneofLazyNestedMessage(let r) = rhs else { preconditionFailure() }
         return l == r
       }()
+      case (.oneofNestedMessage2, .oneofNestedMessage2): return {
+        guard case .oneofNestedMessage2(let l) = lhs, case .oneofNestedMessage2(let r) = rhs else { preconditionFailure() }
+        return l == r
+      }()
       default: return false
       }
     }
@@ -863,6 +876,27 @@ struct ProtobufUnittest_TestAllTypesLite {
     fileprivate var _cc: Int64? = nil
   }
 
+  struct NestedMessage2 {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var dd: Int32 {
+      get {return _dd ?? 0}
+      set {_dd = newValue}
+    }
+    /// Returns true if `dd` has been explicitly set.
+    var hasDd: Bool {return self._dd != nil}
+    /// Clears the value of `dd`. Subsequent reads from it will return its default value.
+    mutating func clearDd() {self._dd = nil}
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+
+    fileprivate var _dd: Int32? = nil
+  }
+
   struct OptionalGroup {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -3874,6 +3908,7 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
     113: .standard(proto: "oneof_string"),
     114: .standard(proto: "oneof_bytes"),
     115: .standard(proto: "oneof_lazy_nested_message"),
+    117: .standard(proto: "oneof_nested_message2"),
     116: .standard(proto: "deceptively_named_list"),
   ]
 
@@ -4156,6 +4191,15 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
           if let v = v {_storage._oneofField = .oneofLazyNestedMessage(v)}
         }()
         case 116: try { try decoder.decodeSingularInt32Field(value: &_storage._deceptivelyNamedList) }()
+        case 117: try {
+          var v: ProtobufUnittest_TestAllTypesLite.NestedMessage2?
+          if let current = _storage._oneofField {
+            try decoder.handleConflictingOneOf()
+            if case .oneofNestedMessage2(let m) = current {v = m}
+          }
+          try decoder.decodeSingularMessageField(value: &v)
+          if let v = v {_storage._oneofField = .oneofNestedMessage2(v)}
+        }()
         default: break
         }
       }
@@ -4401,11 +4445,14 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
         guard case .oneofLazyNestedMessage(let v)? = _storage._oneofField else { preconditionFailure() }
         try visitor.visitSingularMessageField(value: v, fieldNumber: 115)
       }()
-      case nil: break
+      default: break
       }
       if let v = _storage._deceptivelyNamedList {
         try visitor.visitSingularInt32Field(value: v, fieldNumber: 116)
       }
+      if case .oneofNestedMessage2(let v)? = _storage._oneofField {
+        try visitor.visitSingularMessageField(value: v, fieldNumber: 117)
+      }
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -4543,6 +4590,38 @@ extension ProtobufUnittest_TestAllTypesLite.NestedMessage: SwiftProtobuf.Message
   }
 }
 
+extension ProtobufUnittest_TestAllTypesLite.NestedMessage2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufUnittest_TestAllTypesLite.protoMessageName + ".NestedMessage2"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "dd"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self._dd) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if let v = self._dd {
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufUnittest_TestAllTypesLite.NestedMessage2, rhs: ProtobufUnittest_TestAllTypesLite.NestedMessage2) -> Bool {
+    if lhs._dd != rhs._dd {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension ProtobufUnittest_TestAllTypesLite.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = ProtobufUnittest_TestAllTypesLite.protoMessageName + ".OptionalGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [