Skip to content

Commit 8155827

Browse files
thomasvlthomasvl
authored
Updated vendored dependencies (#2026)
protobuf: v34.1 (4b0c3aacf0657fbf38253b38918d3358dd4319ec) abseil: 76bb24329e8bf5f39704eb10d21b9a80befa7c81 tag:20250512.1 This was done by manually running the script and then looking at what files got removed and added to figure out the Package*.swift changes. Note: the script doesn't run on Sequoia without edits because it uses some things in newer versions of python3 than what Apple bundles there.
1 parent 23627a7 commit 8155827

587 files changed

Lines changed: 40281 additions & 18104 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Package.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ let package = Package(
158158
"protobuf/src/google/protobuf/source_context.pb.cc",
159159
"protobuf/src/google/protobuf/struct.pb.cc",
160160
"protobuf/src/google/protobuf/stubs/common.cc",
161+
"protobuf/src/google/protobuf/symbol_checker.cc",
161162
"protobuf/src/google/protobuf/text_format.cc",
162163
"protobuf/src/google/protobuf/timestamp.pb.cc",
163164
"protobuf/src/google/protobuf/type.pb.cc",
@@ -305,9 +306,9 @@ let package = Package(
305306
"protobuf/upb/wire/reader.c",
306307
"protobuf/upb/wire/byte_size.c",
307308
"protobuf/upb/wire/internal/decoder.c",
309+
"protobuf/upb/wire/decode_fast/cardinality.c",
308310
"protobuf/upb/wire/decode_fast/dispatch.c",
309311
"protobuf/upb/wire/decode_fast/field_fixed.c",
310-
"protobuf/upb/wire/decode_fast/field_generic.c",
311312
"protobuf/upb/wire/decode_fast/field_message.c",
312313
"protobuf/upb/wire/decode_fast/field_string.c",
313314
"protobuf/upb/wire/decode_fast/field_varint.c",
@@ -328,7 +329,9 @@ let package = Package(
328329
"protobuf/upb/message/internal/iterator.c",
329330
"protobuf/upb/message/internal/message.c",
330331
"protobuf/upb/mini_table/compat.c",
332+
"protobuf/upb/mini_table/debug_string.c",
331333
"protobuf/upb/mini_table/extension_registry.c",
334+
"protobuf/upb/mini_table/generated_registry.c",
332335
"protobuf/upb/mini_table/message.c",
333336
"protobuf/upb/mini_table/internal/message.c",
334337
"protobuf/upb/mini_descriptor/build_enum.c",

‎Package@swift-6.0.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ let package = Package(
141141
"protobuf/src/google/protobuf/source_context.pb.cc",
142142
"protobuf/src/google/protobuf/struct.pb.cc",
143143
"protobuf/src/google/protobuf/stubs/common.cc",
144+
"protobuf/src/google/protobuf/symbol_checker.cc",
144145
"protobuf/src/google/protobuf/text_format.cc",
145146
"protobuf/src/google/protobuf/timestamp.pb.cc",
146147
"protobuf/src/google/protobuf/type.pb.cc",
@@ -288,9 +289,9 @@ let package = Package(
288289
"protobuf/upb/wire/reader.c",
289290
"protobuf/upb/wire/byte_size.c",
290291
"protobuf/upb/wire/internal/decoder.c",
292+
"protobuf/upb/wire/decode_fast/cardinality.c",
291293
"protobuf/upb/wire/decode_fast/dispatch.c",
292294
"protobuf/upb/wire/decode_fast/field_fixed.c",
293-
"protobuf/upb/wire/decode_fast/field_generic.c",
294295
"protobuf/upb/wire/decode_fast/field_message.c",
295296
"protobuf/upb/wire/decode_fast/field_string.c",
296297
"protobuf/upb/wire/decode_fast/field_varint.c",
@@ -311,7 +312,9 @@ let package = Package(
311312
"protobuf/upb/message/internal/iterator.c",
312313
"protobuf/upb/message/internal/message.c",
313314
"protobuf/upb/mini_table/compat.c",
315+
"protobuf/upb/mini_table/debug_string.c",
314316
"protobuf/upb/mini_table/extension_registry.c",
317+
"protobuf/upb/mini_table/generated_registry.c",
315318
"protobuf/upb/mini_table/message.c",
316319
"protobuf/upb/mini_table/internal/message.c",
317320
"protobuf/upb/mini_descriptor/build_enum.c",

‎Package@swift-6.1.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ let package = Package(
158158
"protobuf/src/google/protobuf/source_context.pb.cc",
159159
"protobuf/src/google/protobuf/struct.pb.cc",
160160
"protobuf/src/google/protobuf/stubs/common.cc",
161+
"protobuf/src/google/protobuf/symbol_checker.cc",
161162
"protobuf/src/google/protobuf/text_format.cc",
162163
"protobuf/src/google/protobuf/timestamp.pb.cc",
163164
"protobuf/src/google/protobuf/type.pb.cc",
@@ -305,9 +306,9 @@ let package = Package(
305306
"protobuf/upb/wire/reader.c",
306307
"protobuf/upb/wire/byte_size.c",
307308
"protobuf/upb/wire/internal/decoder.c",
309+
"protobuf/upb/wire/decode_fast/cardinality.c",
308310
"protobuf/upb/wire/decode_fast/dispatch.c",
309311
"protobuf/upb/wire/decode_fast/field_fixed.c",
310-
"protobuf/upb/wire/decode_fast/field_generic.c",
311312
"protobuf/upb/wire/decode_fast/field_message.c",
312313
"protobuf/upb/wire/decode_fast/field_string.c",
313314
"protobuf/upb/wire/decode_fast/field_varint.c",
@@ -328,7 +329,9 @@ let package = Package(
328329
"protobuf/upb/message/internal/iterator.c",
329330
"protobuf/upb/message/internal/message.c",
330331
"protobuf/upb/mini_table/compat.c",
332+
"protobuf/upb/mini_table/debug_string.c",
331333
"protobuf/upb/mini_table/extension_registry.c",
334+
"protobuf/upb/mini_table/generated_registry.c",
332335
"protobuf/upb/mini_table/message.c",
333336
"protobuf/upb/mini_table/internal/message.c",
334337
"protobuf/upb/mini_descriptor/build_enum.c",

‎Reference/upstream/conformance/test_protos/test_messages_edition2023.pb.swift‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,36 @@ extension ProtobufTestMessages_Editions_TestAllTypesEdition2023 {
934934
clearExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_int32)
935935
}
936936

937+
var ProtobufTestMessages_Editions_extensionString: String {
938+
get {return getExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_string) ?? String()}
939+
set {setExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_string, value: newValue)}
940+
}
941+
/// Returns true if extension `ProtobufTestMessages_Editions_Extensions_extension_string`
942+
/// has been explicitly set.
943+
var hasProtobufTestMessages_Editions_extensionString: Bool {
944+
return hasExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_string)
945+
}
946+
/// Clears the value of extension `ProtobufTestMessages_Editions_Extensions_extension_string`.
947+
/// Subsequent reads from it will return its default value.
948+
mutating func clearProtobufTestMessages_Editions_extensionString() {
949+
clearExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_string)
950+
}
951+
952+
var ProtobufTestMessages_Editions_extensionBytes: Data {
953+
get {return getExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_bytes) ?? Data()}
954+
set {setExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_bytes, value: newValue)}
955+
}
956+
/// Returns true if extension `ProtobufTestMessages_Editions_Extensions_extension_bytes`
957+
/// has been explicitly set.
958+
var hasProtobufTestMessages_Editions_extensionBytes: Bool {
959+
return hasExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_bytes)
960+
}
961+
/// Clears the value of extension `ProtobufTestMessages_Editions_Extensions_extension_bytes`.
962+
/// Subsequent reads from it will return its default value.
963+
mutating func clearProtobufTestMessages_Editions_extensionBytes() {
964+
clearExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_extension_bytes)
965+
}
966+
937967
var ProtobufTestMessages_Editions_groupLikeType: ProtobufTestMessages_Editions_GroupLikeType {
938968
get {return getExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_GroupLikeType) ?? ProtobufTestMessages_Editions_GroupLikeType()}
939969
set {setExtensionValue(ext: ProtobufTestMessages_Editions_Extensions_GroupLikeType, value: newValue)}
@@ -974,6 +1004,8 @@ extension ProtobufTestMessages_Editions_TestAllTypesEdition2023 {
9741004
/// a larger `SwiftProtobuf.SimpleExtensionMap`.
9751005
let ProtobufTestMessages_Editions_TestMessagesEdition2023_Extensions: SwiftProtobuf.SimpleExtensionMap = [
9761006
ProtobufTestMessages_Editions_Extensions_extension_int32,
1007+
ProtobufTestMessages_Editions_Extensions_extension_string,
1008+
ProtobufTestMessages_Editions_Extensions_extension_bytes,
9771009
ProtobufTestMessages_Editions_Extensions_GroupLikeType,
9781010
ProtobufTestMessages_Editions_Extensions_delimited_ext
9791011
]
@@ -987,6 +1019,16 @@ let ProtobufTestMessages_Editions_Extensions_extension_int32 = SwiftProtobuf.Mes
9871019
fieldName: "protobuf_test_messages.editions.extension_int32"
9881020
)
9891021

1022+
let ProtobufTestMessages_Editions_Extensions_extension_string = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufTestMessages_Editions_TestAllTypesEdition2023>(
1023+
_protobuf_fieldNumber: 133,
1024+
fieldName: "protobuf_test_messages.editions.extension_string"
1025+
)
1026+
1027+
let ProtobufTestMessages_Editions_Extensions_extension_bytes = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufTestMessages_Editions_TestAllTypesEdition2023>(
1028+
_protobuf_fieldNumber: 134,
1029+
fieldName: "protobuf_test_messages.editions.extension_bytes"
1030+
)
1031+
9901032
let ProtobufTestMessages_Editions_Extensions_GroupLikeType = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalGroupExtensionField<ProtobufTestMessages_Editions_GroupLikeType>, ProtobufTestMessages_Editions_TestAllTypesEdition2023>(
9911033
_protobuf_fieldNumber: 121,
9921034
fieldName: "protobuf_test_messages.editions.groupliketype"

0 commit comments

Comments
 (0)