Skip to content

Update protobuf to v34.1 #2026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomasvl merged 2 commits into from
Apr 18, 2026
Merged

Update protobuf to v34.1 #2026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
279cd93
Updated vendored dependencies
thomasvl Apr 13, 2026
9594a91
Merge branch 'main' into update_protobuf_abseil
thomasvl Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ let package = Package(
"protobuf/src/google/protobuf/source_context.pb.cc",
"protobuf/src/google/protobuf/struct.pb.cc",
"protobuf/src/google/protobuf/stubs/common.cc",
"protobuf/src/google/protobuf/symbol_checker.cc",
"protobuf/src/google/protobuf/text_format.cc",
"protobuf/src/google/protobuf/timestamp.pb.cc",
"protobuf/src/google/protobuf/type.pb.cc",
Expand Down Expand Up @@ -305,9 +306,9 @@ let package = Package(
"protobuf/upb/wire/reader.c",
"protobuf/upb/wire/byte_size.c",
"protobuf/upb/wire/internal/decoder.c",
"protobuf/upb/wire/decode_fast/cardinality.c",
"protobuf/upb/wire/decode_fast/dispatch.c",
"protobuf/upb/wire/decode_fast/field_fixed.c",
"protobuf/upb/wire/decode_fast/field_generic.c",
"protobuf/upb/wire/decode_fast/field_message.c",
"protobuf/upb/wire/decode_fast/field_string.c",
"protobuf/upb/wire/decode_fast/field_varint.c",
Expand All @@ -328,7 +329,9 @@ let package = Package(
"protobuf/upb/message/internal/iterator.c",
"protobuf/upb/message/internal/message.c",
"protobuf/upb/mini_table/compat.c",
"protobuf/upb/mini_table/debug_string.c",
"protobuf/upb/mini_table/extension_registry.c",
"protobuf/upb/mini_table/generated_registry.c",
"protobuf/upb/mini_table/message.c",
"protobuf/upb/mini_table/internal/message.c",
"protobuf/upb/mini_descriptor/build_enum.c",
Expand Down
5 changes: 4 additions & 1 deletion Package@swift-6.0.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ let package = Package(
"protobuf/src/google/protobuf/source_context.pb.cc",
"protobuf/src/google/protobuf/struct.pb.cc",
"protobuf/src/google/protobuf/stubs/common.cc",
"protobuf/src/google/protobuf/symbol_checker.cc",
"protobuf/src/google/protobuf/text_format.cc",
"protobuf/src/google/protobuf/timestamp.pb.cc",
"protobuf/src/google/protobuf/type.pb.cc",
Expand Down Expand Up @@ -288,9 +289,9 @@ let package = Package(
"protobuf/upb/wire/reader.c",
"protobuf/upb/wire/byte_size.c",
"protobuf/upb/wire/internal/decoder.c",
"protobuf/upb/wire/decode_fast/cardinality.c",
"protobuf/upb/wire/decode_fast/dispatch.c",
"protobuf/upb/wire/decode_fast/field_fixed.c",
"protobuf/upb/wire/decode_fast/field_generic.c",
"protobuf/upb/wire/decode_fast/field_message.c",
"protobuf/upb/wire/decode_fast/field_string.c",
"protobuf/upb/wire/decode_fast/field_varint.c",
Expand All @@ -311,7 +312,9 @@ let package = Package(
"protobuf/upb/message/internal/iterator.c",
"protobuf/upb/message/internal/message.c",
"protobuf/upb/mini_table/compat.c",
"protobuf/upb/mini_table/debug_string.c",
"protobuf/upb/mini_table/extension_registry.c",
"protobuf/upb/mini_table/generated_registry.c",
"protobuf/upb/mini_table/message.c",
"protobuf/upb/mini_table/internal/message.c",
"protobuf/upb/mini_descriptor/build_enum.c",
Expand Down
5 changes: 4 additions & 1 deletion Package@swift-6.1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ let package = Package(
"protobuf/src/google/protobuf/source_context.pb.cc",
"protobuf/src/google/protobuf/struct.pb.cc",
"protobuf/src/google/protobuf/stubs/common.cc",
"protobuf/src/google/protobuf/symbol_checker.cc",
"protobuf/src/google/protobuf/text_format.cc",
"protobuf/src/google/protobuf/timestamp.pb.cc",
"protobuf/src/google/protobuf/type.pb.cc",
Expand Down Expand Up @@ -305,9 +306,9 @@ let package = Package(
"protobuf/upb/wire/reader.c",
"protobuf/upb/wire/byte_size.c",
"protobuf/upb/wire/internal/decoder.c",
"protobuf/upb/wire/decode_fast/cardinality.c",
"protobuf/upb/wire/decode_fast/dispatch.c",
"protobuf/upb/wire/decode_fast/field_fixed.c",
"protobuf/upb/wire/decode_fast/field_generic.c",
"protobuf/upb/wire/decode_fast/field_message.c",
"protobuf/upb/wire/decode_fast/field_string.c",
"protobuf/upb/wire/decode_fast/field_varint.c",
Expand All @@ -328,7 +329,9 @@ let package = Package(
"protobuf/upb/message/internal/iterator.c",
"protobuf/upb/message/internal/message.c",
"protobuf/upb/mini_table/compat.c",
"protobuf/upb/mini_table/debug_string.c",
"protobuf/upb/mini_table/extension_registry.c",
"protobuf/upb/mini_table/generated_registry.c",
"protobuf/upb/mini_table/message.c",
"protobuf/upb/mini_table/internal/message.c",
"protobuf/upb/mini_descriptor/build_enum.c",
Expand Down
42 changes: 42 additions & 0 deletions Reference/upstream/conformance/test_protos/test_messages_edition2023.pb.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,36 @@ extension ProtobufTestMessages_Editions_TestAllTypesEdition2023 {
clearExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_int32)
}

var ProtobufTestMessages_Editions_extensionString: String {
get {return getExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_string) ?? String()}
set {setExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_string, value: newValue)}
}
/// Returns true if extension `ProtobufTestMessages_Editions_Extensions_extension_string`
/// has been explicitly set.
var hasProtobufTestMessages_Editions_extensionString: Bool {
return hasExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_string)
}
/// Clears the value of extension `ProtobufTestMessages_Editions_Extensions_extension_string`.
/// Subsequent reads from it will return its default value.
mutating func clearProtobufTestMessages_Editions_extensionString() {
clearExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_string)
}

var ProtobufTestMessages_Editions_extensionBytes: Data {
get {return getExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_bytes) ?? Data()}
set {setExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_bytes, value: newValue)}
}
/// Returns true if extension `ProtobufTestMessages_Editions_Extensions_extension_bytes`
/// has been explicitly set.
var hasProtobufTestMessages_Editions_extensionBytes: Bool {
return hasExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_bytes)
}
/// Clears the value of extension `ProtobufTestMessages_Editions_Extensions_extension_bytes`.
/// Subsequent reads from it will return its default value.
mutating func clearProtobufTestMessages_Editions_extensionBytes() {
clearExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_bytes)
}

var ProtobufTestMessages_Editions_groupLikeType: ProtobufTestMessages_Editions_GroupLikeType {
get {return getExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_GroupLikeType) ?? ProtobufTestMessages_Editions_GroupLikeType()}
set {setExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_GroupLikeType, value: newValue)}
Expand Down Expand Up @@ -974,6 +1004,8 @@ extension ProtobufTestMessages_Editions_TestAllTypesEdition2023 {
/// a larger `SwiftProtobuf.SimpleExtensionMap`.
let ProtobufTestMessages_Editions_TestMessagesEdition2023_Extensions: SwiftProtobuf.SimpleExtensionMap = [
ProtobufTestMessages_Editions_Extensions_extension_int32,
ProtobufTestMessages_Editions_Extensions_extension_string,
ProtobufTestMessages_Editions_Extensions_extension_bytes,
ProtobufTestMessages_Editions_Extensions_GroupLikeType,
ProtobufTestMessages_Editions_Extensions_delimited_ext
]
Expand All @@ -987,6 +1019,16 @@ let ProtobufTestMessages_Editions_Extensions_extension_int32 = SwiftProtobuf.Mes
fieldName: "protobuf_test_messages.editions.extension_int32"
)

let ProtobufTestMessages_Editions_Extensions_extension_string = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufTestMessages_Editions_TestAllTypesEdition2023>(
_protobuf_fieldNumber: 133,
fieldName: "protobuf_test_messages.editions.extension_string"
)

let ProtobufTestMessages_Editions_Extensions_extension_bytes = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufTestMessages_Editions_TestAllTypesEdition2023>(
_protobuf_fieldNumber: 134,
fieldName: "protobuf_test_messages.editions.extension_bytes"
)

let ProtobufTestMessages_Editions_Extensions_GroupLikeType = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalGroupExtensionField<ProtobufTestMessages_Editions_GroupLikeType>, ProtobufTestMessages_Editions_TestAllTypesEdition2023>(
_protobuf_fieldNumber: 121,
fieldName: "protobuf_test_messages.editions.groupliketype"
Expand Down
Loading