Skip to content

Commit 5529100

Browse files
thomasvlthomasvl
committed
Revert "Drop Swift 4.0 support (apple#905)"
This reverts commit 687cff5. SwiftPM only has constants for 4.0 and 4.2 (as well as the compiler only taking those values (and not 4.1)). So to drop the 4.0 from there, it would actually mean moving up to 4.2 which is more agressive than our policy, so it seem like we have to keep 4.0 support because you can't tell the SwiftPM or the compiler to be atleast 4.1. So we can't drop support until we can move all the way up to 4.2.
1 parent 687cff5 commit 5529100

File tree

53 files changed

+1088
-7
lines changed

Some content is hidden

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

53 files changed

+1088
-7
lines changed

‎Reference/conformance/conformance.pb.swift‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,18 @@ struct Conformance_ConformanceRequest {
298298
/// Google internal only. Opensource testees just skip it.
299299
case jspbPayload(String)
300300
case textPayload(String)
301+
302+
#if !swift(>=4.1)
303+
static func ==(lhs: Conformance_ConformanceRequest.OneOf_Payload, rhs: Conformance_ConformanceRequest.OneOf_Payload) -> Bool {
304+
switch (lhs, rhs) {
305+
case (.protobufPayload(let l), .protobufPayload(let r)): return l == r
306+
case (.jsonPayload(let l), .jsonPayload(let r)): return l == r
307+
case (.jspbPayload(let l), .jspbPayload(let r)): return l == r
308+
case (.textPayload(let l), .textPayload(let r)): return l == r
309+
default: return false
310+
}
311+
}
312+
#endif
301313
}
302314

303315
init() {}
@@ -432,6 +444,22 @@ struct Conformance_ConformanceResponse {
432444
/// If the input was successfully parsed and the requested output was
433445
/// TEXT_FORMAT, serialize to TEXT_FORMAT and set it in this field.
434446
case textPayload(String)
447+
448+
#if !swift(>=4.1)
449+
static func ==(lhs: Conformance_ConformanceResponse.OneOf_Result, rhs: Conformance_ConformanceResponse.OneOf_Result) -> Bool {
450+
switch (lhs, rhs) {
451+
case (.parseError(let l), .parseError(let r)): return l == r
452+
case (.serializeError(let l), .serializeError(let r)): return l == r
453+
case (.runtimeError(let l), .runtimeError(let r)): return l == r
454+
case (.protobufPayload(let l), .protobufPayload(let r)): return l == r
455+
case (.jsonPayload(let l), .jsonPayload(let r)): return l == r
456+
case (.skipped(let l), .skipped(let r)): return l == r
457+
case (.jspbPayload(let l), .jspbPayload(let r)): return l == r
458+
case (.textPayload(let l), .textPayload(let r)): return l == r
459+
default: return false
460+
}
461+
}
462+
#endif
435463
}
436464

437465
init() {}

‎Reference/google/protobuf/struct.pb.swift‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,20 @@ struct Google_Protobuf_Value {
198198
case structValue(Google_Protobuf_Struct)
199199
/// Represents a repeated `Value`.
200200
case listValue(Google_Protobuf_ListValue)
201+
202+
#if !swift(>=4.1)
203+
static func ==(lhs: Google_Protobuf_Value.OneOf_Kind, rhs: Google_Protobuf_Value.OneOf_Kind) -> Bool {
204+
switch (lhs, rhs) {
205+
case (.nullValue(let l), .nullValue(let r)): return l == r
206+
case (.numberValue(let l), .numberValue(let r)): return l == r
207+
case (.stringValue(let l), .stringValue(let r)): return l == r
208+
case (.boolValue(let l), .boolValue(let r)): return l == r
209+
case (.structValue(let l), .structValue(let r)): return l == r
210+
case (.listValue(let l), .listValue(let r)): return l == r
211+
default: return false
212+
}
213+
}
214+
#endif
201215
}
202216

203217
init() {}

‎Reference/google/protobuf/test_messages_proto2.pb.swift‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -909,6 +909,23 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
909909
case oneofFloat(Float)
910910
case oneofDouble(Double)
911911
case oneofEnum(ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum)
912+
913+
#if !swift(>=4.1)
914+
static func ==(lhs: ProtobufTestMessages_Proto2_TestAllTypesProto2.OneOf_OneofField, rhs: ProtobufTestMessages_Proto2_TestAllTypesProto2.OneOf_OneofField) -> Bool {
915+
switch (lhs, rhs) {
916+
case (.oneofUint32(let l), .oneofUint32(let r)): return l == r
917+
case (.oneofNestedMessage(let l), .oneofNestedMessage(let r)): return l == r
918+
case (.oneofString(let l), .oneofString(let r)): return l == r
919+
case (.oneofBytes(let l), .oneofBytes(let r)): return l == r
920+
case (.oneofBool(let l), .oneofBool(let r)): return l == r
921+
case (.oneofUint64(let l), .oneofUint64(let r)): return l == r
922+
case (.oneofFloat(let l), .oneofFloat(let r)): return l == r
923+
case (.oneofDouble(let l), .oneofDouble(let r)): return l == r
924+
case (.oneofEnum(let l), .oneofEnum(let r)): return l == r
925+
default: return false
926+
}
927+
}
928+
#endif
912929
}
913930

914931
enum NestedEnum: SwiftProtobuf.Enum {

‎Reference/google/protobuf/test_messages_proto3.pb.swift‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,23 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
980980
case oneofFloat(Float)
981981
case oneofDouble(Double)
982982
case oneofEnum(ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum)
983+
984+
#if !swift(>=4.1)
985+
static func ==(lhs: ProtobufTestMessages_Proto3_TestAllTypesProto3.OneOf_OneofField, rhs: ProtobufTestMessages_Proto3_TestAllTypesProto3.OneOf_OneofField) -> Bool {
986+
switch (lhs, rhs) {
987+
case (.oneofUint32(let l), .oneofUint32(let r)): return l == r
988+
case (.oneofNestedMessage(let l), .oneofNestedMessage(let r)): return l == r
989+
case (.oneofString(let l), .oneofString(let r)): return l == r
990+
case (.oneofBytes(let l), .oneofBytes(let r)): return l == r
991+
case (.oneofBool(let l), .oneofBool(let r)): return l == r
992+
case (.oneofUint64(let l), .oneofUint64(let r)): return l == r
993+
case (.oneofFloat(let l), .oneofFloat(let r)): return l == r
994+
case (.oneofDouble(let l), .oneofDouble(let r)): return l == r
995+
case (.oneofEnum(let l), .oneofEnum(let r)): return l == r
996+
default: return false
997+
}
998+
}
999+
#endif
9831000
}
9841001

9851002
enum NestedEnum: SwiftProtobuf.Enum {

‎Reference/google/protobuf/unittest.pb.swift‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,18 @@ struct ProtobufUnittest_TestAllTypes {
11111111
case oneofNestedMessage(ProtobufUnittest_TestAllTypes.NestedMessage)
11121112
case oneofString(String)
11131113
case oneofBytes(Data)
1114+
1115+
#if !swift(>=4.1)
1116+
static func ==(lhs: ProtobufUnittest_TestAllTypes.OneOf_OneofField, rhs: ProtobufUnittest_TestAllTypes.OneOf_OneofField) -> Bool {
1117+
switch (lhs, rhs) {
1118+
case (.oneofUint32(let l), .oneofUint32(let r)): return l == r
1119+
case (.oneofNestedMessage(let l), .oneofNestedMessage(let r)): return l == r
1120+
case (.oneofString(let l), .oneofString(let r)): return l == r
1121+
case (.oneofBytes(let l), .oneofBytes(let r)): return l == r
1122+
default: return false
1123+
}
1124+
}
1125+
#endif
11141126
}
11151127

11161128
enum NestedEnum: SwiftProtobuf.Enum {
@@ -1290,6 +1302,14 @@ struct ProtobufUnittest_TestDeprecatedFields {
12901302

12911303
enum OneOf_OneofFields: Equatable {
12921304
case deprecatedInt32InOneof(Int32)
1305+
1306+
#if !swift(>=4.1)
1307+
static func ==(lhs: ProtobufUnittest_TestDeprecatedFields.OneOf_OneofFields, rhs: ProtobufUnittest_TestDeprecatedFields.OneOf_OneofFields) -> Bool {
1308+
switch (lhs, rhs) {
1309+
case (.deprecatedInt32InOneof(let l), .deprecatedInt32InOneof(let r)): return l == r
1310+
}
1311+
}
1312+
#endif
12931313
}
12941314

12951315
init() {}
@@ -3105,6 +3125,18 @@ struct ProtobufUnittest_TestOneof {
31053125
case fooString(String)
31063126
case fooMessage(ProtobufUnittest_TestAllTypes)
31073127
case fooGroup(ProtobufUnittest_TestOneof.FooGroup)
3128+
3129+
#if !swift(>=4.1)
3130+
static func ==(lhs: ProtobufUnittest_TestOneof.OneOf_Foo, rhs: ProtobufUnittest_TestOneof.OneOf_Foo) -> Bool {
3131+
switch (lhs, rhs) {
3132+
case (.fooInt(let l), .fooInt(let r)): return l == r
3133+
case (.fooString(let l), .fooString(let r)): return l == r
3134+
case (.fooMessage(let l), .fooMessage(let r)): return l == r
3135+
case (.fooGroup(let l), .fooGroup(let r)): return l == r
3136+
default: return false
3137+
}
3138+
}
3139+
#endif
31083140
}
31093141

31103142
struct FooGroup {
@@ -3387,6 +3419,23 @@ struct ProtobufUnittest_TestOneof2 {
33873419
case fooMessage(ProtobufUnittest_TestOneof2.NestedMessage)
33883420
case fooGroup(ProtobufUnittest_TestOneof2.FooGroup)
33893421
case fooLazyMessage(ProtobufUnittest_TestOneof2.NestedMessage)
3422+
3423+
#if !swift(>=4.1)
3424+
static func ==(lhs: ProtobufUnittest_TestOneof2.OneOf_Foo, rhs: ProtobufUnittest_TestOneof2.OneOf_Foo) -> Bool {
3425+
switch (lhs, rhs) {
3426+
case (.fooInt(let l), .fooInt(let r)): return l == r
3427+
case (.fooString(let l), .fooString(let r)): return l == r
3428+
case (.fooCord(let l), .fooCord(let r)): return l == r
3429+
case (.fooStringPiece(let l), .fooStringPiece(let r)): return l == r
3430+
case (.fooBytes(let l), .fooBytes(let r)): return l == r
3431+
case (.fooEnum(let l), .fooEnum(let r)): return l == r
3432+
case (.fooMessage(let l), .fooMessage(let r)): return l == r
3433+
case (.fooGroup(let l), .fooGroup(let r)): return l == r
3434+
case (.fooLazyMessage(let l), .fooLazyMessage(let r)): return l == r
3435+
default: return false
3436+
}
3437+
}
3438+
#endif
33903439
}
33913440

33923441
enum OneOf_Bar: Equatable {
@@ -3396,6 +3445,20 @@ struct ProtobufUnittest_TestOneof2 {
33963445
case barStringPiece(String)
33973446
case barBytes(Data)
33983447
case barEnum(ProtobufUnittest_TestOneof2.NestedEnum)
3448+
3449+
#if !swift(>=4.1)
3450+
static func ==(lhs: ProtobufUnittest_TestOneof2.OneOf_Bar, rhs: ProtobufUnittest_TestOneof2.OneOf_Bar) -> Bool {
3451+
switch (lhs, rhs) {
3452+
case (.barInt(let l), .barInt(let r)): return l == r
3453+
case (.barString(let l), .barString(let r)): return l == r
3454+
case (.barCord(let l), .barCord(let r)): return l == r
3455+
case (.barStringPiece(let l), .barStringPiece(let r)): return l == r
3456+
case (.barBytes(let l), .barBytes(let r)): return l == r
3457+
case (.barEnum(let l), .barEnum(let r)): return l == r
3458+
default: return false
3459+
}
3460+
}
3461+
#endif
33993462
}
34003463

34013464
enum NestedEnum: SwiftProtobuf.Enum {
@@ -3534,6 +3597,17 @@ struct ProtobufUnittest_TestRequiredOneof {
35343597
case fooInt(Int32)
35353598
case fooString(String)
35363599
case fooMessage(ProtobufUnittest_TestRequiredOneof.NestedMessage)
3600+
3601+
#if !swift(>=4.1)
3602+
static func ==(lhs: ProtobufUnittest_TestRequiredOneof.OneOf_Foo, rhs: ProtobufUnittest_TestRequiredOneof.OneOf_Foo) -> Bool {
3603+
switch (lhs, rhs) {
3604+
case (.fooInt(let l), .fooInt(let r)): return l == r
3605+
case (.fooString(let l), .fooString(let r)): return l == r
3606+
case (.fooMessage(let l), .fooMessage(let r)): return l == r
3607+
default: return false
3608+
}
3609+
}
3610+
#endif
35373611
}
35383612

35393613
struct NestedMessage {
@@ -4266,6 +4340,18 @@ struct ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.ExtensibleMessage {
42664340
case oneofTestAllTypes(ProtobufUnittest_TestAllTypes)
42674341
case oneofString(String)
42684342
case oneofBytes(Data)
4343+
4344+
#if !swift(>=4.1)
4345+
static func ==(lhs: ProtobufUnittest_TestHugeFieldNumbers.OneOf_OneofField, rhs: ProtobufUnittest_TestHugeFieldNumbers.OneOf_OneofField) -> Bool {
4346+
switch (lhs, rhs) {
4347+
case (.oneofUint32(let l), .oneofUint32(let r)): return l == r
4348+
case (.oneofTestAllTypes(let l), .oneofTestAllTypes(let r)): return l == r
4349+
case (.oneofString(let l), .oneofString(let r)): return l == r
4350+
case (.oneofBytes(let l), .oneofBytes(let r)): return l == r
4351+
default: return false
4352+
}
4353+
}
4354+
#endif
42694355
}
42704356

42714357
struct OptionalGroup {

‎Reference/google/protobuf/unittest_custom_options.pb.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,14 @@ struct ProtobufUnittest_TestMessageWithCustomOptions {
150150

151151
enum OneOf_AnOneof: Equatable {
152152
case oneofField(Int32)
153+
154+
#if !swift(>=4.1)
155+
static func ==(lhs: ProtobufUnittest_TestMessageWithCustomOptions.OneOf_AnOneof, rhs: ProtobufUnittest_TestMessageWithCustomOptions.OneOf_AnOneof) -> Bool {
156+
switch (lhs, rhs) {
157+
case (.oneofField(let l), .oneofField(let r)): return l == r
158+
}
159+
}
160+
#endif
153161
}
154162

155163
enum AnEnum: SwiftProtobuf.Enum {

‎Reference/google/protobuf/unittest_lite.pb.swift‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,19 @@ struct ProtobufUnittest_TestAllTypesLite {
769769
case oneofString(String)
770770
case oneofBytes(Data)
771771
case oneofLazyNestedMessage(ProtobufUnittest_TestAllTypesLite.NestedMessage)
772+
773+
#if !swift(>=4.1)
774+
static func ==(lhs: ProtobufUnittest_TestAllTypesLite.OneOf_OneofField, rhs: ProtobufUnittest_TestAllTypesLite.OneOf_OneofField) -> Bool {
775+
switch (lhs, rhs) {
776+
case (.oneofUint32(let l), .oneofUint32(let r)): return l == r
777+
case (.oneofNestedMessage(let l), .oneofNestedMessage(let r)): return l == r
778+
case (.oneofString(let l), .oneofString(let r)): return l == r
779+
case (.oneofBytes(let l), .oneofBytes(let r)): return l == r
780+
case (.oneofLazyNestedMessage(let l), .oneofLazyNestedMessage(let r)): return l == r
781+
default: return false
782+
}
783+
}
784+
#endif
772785
}
773786

774787
enum NestedEnum: SwiftProtobuf.Enum {
@@ -1417,6 +1430,18 @@ struct ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.ExtensibleMessag
14171430
case oneofTestAllTypes(ProtobufUnittest_TestAllTypesLite)
14181431
case oneofString(String)
14191432
case oneofBytes(Data)
1433+
1434+
#if !swift(>=4.1)
1435+
static func ==(lhs: ProtobufUnittest_TestHugeFieldNumbersLite.OneOf_OneofField, rhs: ProtobufUnittest_TestHugeFieldNumbersLite.OneOf_OneofField) -> Bool {
1436+
switch (lhs, rhs) {
1437+
case (.oneofUint32(let l), .oneofUint32(let r)): return l == r
1438+
case (.oneofTestAllTypes(let l), .oneofTestAllTypes(let r)): return l == r
1439+
case (.oneofString(let l), .oneofString(let r)): return l == r
1440+
case (.oneofBytes(let l), .oneofBytes(let r)): return l == r
1441+
default: return false
1442+
}
1443+
}
1444+
#endif
14201445
}
14211446

14221447
struct OptionalGroup {
@@ -1540,6 +1565,23 @@ struct ProtobufUnittest_TestOneofParsingLite {
15401565
case oneofStringStringPiece(String)
15411566
case oneofBytesStringPiece(Data)
15421567
case oneofEnum(ProtobufUnittest_V2EnumLite)
1568+
1569+
#if !swift(>=4.1)
1570+
static func ==(lhs: ProtobufUnittest_TestOneofParsingLite.OneOf_OneofField, rhs: ProtobufUnittest_TestOneofParsingLite.OneOf_OneofField) -> Bool {
1571+
switch (lhs, rhs) {
1572+
case (.oneofInt32(let l), .oneofInt32(let r)): return l == r
1573+
case (.oneofSubmessage(let l), .oneofSubmessage(let r)): return l == r
1574+
case (.oneofString(let l), .oneofString(let r)): return l == r
1575+
case (.oneofBytes(let l), .oneofBytes(let r)): return l == r
1576+
case (.oneofStringCord(let l), .oneofStringCord(let r)): return l == r
1577+
case (.oneofBytesCord(let l), .oneofBytesCord(let r)): return l == r
1578+
case (.oneofStringStringPiece(let l), .oneofStringStringPiece(let r)): return l == r
1579+
case (.oneofBytesStringPiece(let l), .oneofBytesStringPiece(let r)): return l == r
1580+
case (.oneofEnum(let l), .oneofEnum(let r)): return l == r
1581+
default: return false
1582+
}
1583+
}
1584+
#endif
15431585
}
15441586

15451587
init() {}

‎Reference/google/protobuf/unittest_no_arena.pb.swift‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,19 @@ struct ProtobufUnittestNoArena_TestAllTypes {
699699
case oneofString(String)
700700
case oneofBytes(Data)
701701
case lazyOneofNestedMessage(ProtobufUnittestNoArena_TestAllTypes.NestedMessage)
702+
703+
#if !swift(>=4.1)
704+
static func ==(lhs: ProtobufUnittestNoArena_TestAllTypes.OneOf_OneofField, rhs: ProtobufUnittestNoArena_TestAllTypes.OneOf_OneofField) -> Bool {
705+
switch (lhs, rhs) {
706+
case (.oneofUint32(let l), .oneofUint32(let r)): return l == r
707+
case (.oneofNestedMessage(let l), .oneofNestedMessage(let r)): return l == r
708+
case (.oneofString(let l), .oneofString(let r)): return l == r
709+
case (.oneofBytes(let l), .oneofBytes(let r)): return l == r
710+
case (.lazyOneofNestedMessage(let l), .lazyOneofNestedMessage(let r)): return l == r
711+
default: return false
712+
}
713+
}
714+
#endif
702715
}
703716

704717
enum NestedEnum: SwiftProtobuf.Enum {

‎Reference/google/protobuf/unittest_no_field_presence.pb.swift‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,18 @@ struct Proto2NofieldpresenceUnittest_TestAllTypes {
399399
case oneofNestedMessage(Proto2NofieldpresenceUnittest_TestAllTypes.NestedMessage)
400400
case oneofString(String)
401401
case oneofEnum(Proto2NofieldpresenceUnittest_TestAllTypes.NestedEnum)
402+
403+
#if !swift(>=4.1)
404+
static func ==(lhs: Proto2NofieldpresenceUnittest_TestAllTypes.OneOf_OneofField, rhs: Proto2NofieldpresenceUnittest_TestAllTypes.OneOf_OneofField) -> Bool {
405+
switch (lhs, rhs) {
406+
case (.oneofUint32(let l), .oneofUint32(let r)): return l == r
407+
case (.oneofNestedMessage(let l), .oneofNestedMessage(let r)): return l == r
408+
case (.oneofString(let l), .oneofString(let r)): return l == r
409+
case (.oneofEnum(let l), .oneofEnum(let r)): return l == r
410+
default: return false
411+
}
412+
}
413+
#endif
402414
}
403415

404416
enum NestedEnum: SwiftProtobuf.Enum {

‎Reference/google/protobuf/unittest_optimize_for.pb.swift‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,16 @@ struct ProtobufUnittest_TestOptimizedForSize: SwiftProtobuf.ExtensibleMessage {
104104
enum OneOf_Foo: Equatable {
105105
case integerField(Int32)
106106
case stringField(String)
107+
108+
#if !swift(>=4.1)
109+
static func ==(lhs: ProtobufUnittest_TestOptimizedForSize.OneOf_Foo, rhs: ProtobufUnittest_TestOptimizedForSize.OneOf_Foo) -> Bool {
110+
switch (lhs, rhs) {
111+
case (.integerField(let l), .integerField(let r)): return l == r
112+
case (.stringField(let l), .stringField(let r)): return l == r
113+
default: return false
114+
}
115+
}
116+
#endif
107117
}
108118

109119
init() {}

0 commit comments

Comments
 (0)