Skip to content

Commit 8af0ee9

Browse files
[in_app_purchase] Rename Swift Pigeon output file (#10465)
Gives the Swift messages file a more idiomatic output filename, which does not include an underscore. Works around flutter/flutter#178736 ## Pre-Review Checklist [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
1 parent 96e193e commit 8af0ee9

File tree

2 files changed

+38
-39
lines changed

2 files changed

+38
-39
lines changed
Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
7373
return value as! T?
7474
}
7575

76-
// swift-format-ignore: AlwaysUseLowerCamelCase
77-
func deepEqualssk2_pigeon(_ lhs: Any?, _ rhs: Any?) -> Bool {
76+
func deepEqualsStoreKit2Messages(_ lhs: Any?, _ rhs: Any?) -> Bool {
7877
let cleanLhs = nilOrValue(lhs) as Any?
7978
let cleanRhs = nilOrValue(rhs) as Any?
8079
switch (cleanLhs, cleanRhs) {
@@ -93,7 +92,7 @@ func deepEqualssk2_pigeon(_ lhs: Any?, _ rhs: Any?) -> Bool {
9392
case let (cleanLhsArray, cleanRhsArray) as ([Any?], [Any?]):
9493
guard cleanLhsArray.count == cleanRhsArray.count else { return false }
9594
for (index, element) in cleanLhsArray.enumerated() {
96-
if !deepEqualssk2_pigeon(element, cleanRhsArray[index]) {
95+
if !deepEqualsStoreKit2Messages(element, cleanRhsArray[index]) {
9796
return false
9897
}
9998
}
@@ -103,7 +102,7 @@ func deepEqualssk2_pigeon(_ lhs: Any?, _ rhs: Any?) -> Bool {
103102
guard cleanLhsDictionary.count == cleanRhsDictionary.count else { return false }
104103
for (key, cleanLhsValue) in cleanLhsDictionary {
105104
guard cleanRhsDictionary.index(forKey: key) != nil else { return false }
106-
if !deepEqualssk2_pigeon(cleanLhsValue, cleanRhsDictionary[key]!) {
105+
if !deepEqualsStoreKit2Messages(cleanLhsValue, cleanRhsDictionary[key]!) {
107106
return false
108107
}
109108
}
@@ -115,17 +114,16 @@ func deepEqualssk2_pigeon(_ lhs: Any?, _ rhs: Any?) -> Bool {
115114
}
116115
}
117116

118-
// swift-format-ignore: AlwaysUseLowerCamelCase
119-
func deepHashsk2_pigeon(value: Any?, hasher: inout Hasher) {
117+
func deepHashStoreKit2Messages(value: Any?, hasher: inout Hasher) {
120118
if let valueList = value as? [AnyHashable] {
121-
for item in valueList { deepHashsk2_pigeon(value: item, hasher: &hasher) }
119+
for item in valueList { deepHashStoreKit2Messages(value: item, hasher: &hasher) }
122120
return
123121
}
124122

125123
if let valueDict = value as? [AnyHashable: AnyHashable] {
126124
for key in valueDict.keys {
127125
hasher.combine(key)
128-
deepHashsk2_pigeon(value: valueDict[key]!, hasher: &hasher)
126+
deepHashStoreKit2Messages(value: valueDict[key]!, hasher: &hasher)
129127
}
130128
return
131129
}
@@ -212,10 +210,10 @@ struct SK2SubscriptionOfferMessage: Hashable {
212210
]
213211
}
214212
static func == (lhs: SK2SubscriptionOfferMessage, rhs: SK2SubscriptionOfferMessage) -> Bool {
215-
return deepEqualssk2_pigeon(lhs.toList(), rhs.toList())
213+
return deepEqualsStoreKit2Messages(lhs.toList(), rhs.toList())
216214
}
217215
func hash(into hasher: inout Hasher) {
218-
deepHashsk2_pigeon(value: toList(), hasher: &hasher)
216+
deepHashStoreKit2Messages(value: toList(), hasher: &hasher)
219217
}
220218
}
221219

@@ -243,10 +241,10 @@ struct SK2SubscriptionPeriodMessage: Hashable {
243241
]
244242
}
245243
static func == (lhs: SK2SubscriptionPeriodMessage, rhs: SK2SubscriptionPeriodMessage) -> Bool {
246-
return deepEqualssk2_pigeon(lhs.toList(), rhs.toList())
244+
return deepEqualsStoreKit2Messages(lhs.toList(), rhs.toList())
247245
}
248246
func hash(into hasher: inout Hasher) {
249-
deepHashsk2_pigeon(value: toList(), hasher: &hasher)
247+
deepHashStoreKit2Messages(value: toList(), hasher: &hasher)
250248
}
251249
}
252250

@@ -279,10 +277,10 @@ struct SK2SubscriptionInfoMessage: Hashable {
279277
]
280278
}
281279
static func == (lhs: SK2SubscriptionInfoMessage, rhs: SK2SubscriptionInfoMessage) -> Bool {
282-
return deepEqualssk2_pigeon(lhs.toList(), rhs.toList())
280+
return deepEqualsStoreKit2Messages(lhs.toList(), rhs.toList())
283281
}
284282
func hash(into hasher: inout Hasher) {
285-
deepHashsk2_pigeon(value: toList(), hasher: &hasher)
283+
deepHashStoreKit2Messages(value: toList(), hasher: &hasher)
286284
}
287285
}
288286

@@ -343,10 +341,10 @@ struct SK2ProductMessage: Hashable {
343341
]
344342
}
345343
static func == (lhs: SK2ProductMessage, rhs: SK2ProductMessage) -> Bool {
346-
return deepEqualssk2_pigeon(lhs.toList(), rhs.toList())
344+
return deepEqualsStoreKit2Messages(lhs.toList(), rhs.toList())
347345
}
348346
func hash(into hasher: inout Hasher) {
349-
deepHashsk2_pigeon(value: toList(), hasher: &hasher)
347+
deepHashStoreKit2Messages(value: toList(), hasher: &hasher)
350348
}
351349
}
352350

@@ -372,10 +370,10 @@ struct SK2PriceLocaleMessage: Hashable {
372370
]
373371
}
374372
static func == (lhs: SK2PriceLocaleMessage, rhs: SK2PriceLocaleMessage) -> Bool {
375-
return deepEqualssk2_pigeon(lhs.toList(), rhs.toList())
373+
return deepEqualsStoreKit2Messages(lhs.toList(), rhs.toList())
376374
}
377375
func hash(into hasher: inout Hasher) {
378-
deepHashsk2_pigeon(value: toList(), hasher: &hasher)
376+
deepHashStoreKit2Messages(value: toList(), hasher: &hasher)
379377
}
380378
}
381379

@@ -414,10 +412,10 @@ struct SK2SubscriptionOfferSignatureMessage: Hashable {
414412
static func == (
415413
lhs: SK2SubscriptionOfferSignatureMessage, rhs: SK2SubscriptionOfferSignatureMessage
416414
) -> Bool {
417-
return deepEqualssk2_pigeon(lhs.toList(), rhs.toList())
415+
return deepEqualsStoreKit2Messages(lhs.toList(), rhs.toList())
418416
}
419417
func hash(into hasher: inout Hasher) {
420-
deepHashsk2_pigeon(value: toList(), hasher: &hasher)
418+
deepHashStoreKit2Messages(value: toList(), hasher: &hasher)
421419
}
422420
}
423421

@@ -445,10 +443,10 @@ struct SK2SubscriptionOfferPurchaseMessage: Hashable {
445443
static func == (
446444
lhs: SK2SubscriptionOfferPurchaseMessage, rhs: SK2SubscriptionOfferPurchaseMessage
447445
) -> Bool {
448-
return deepEqualssk2_pigeon(lhs.toList(), rhs.toList())
446+
return deepEqualsStoreKit2Messages(lhs.toList(), rhs.toList())
449447
}
450448
func hash(into hasher: inout Hasher) {
451-
deepHashsk2_pigeon(value: toList(), hasher: &hasher)
449+
deepHashStoreKit2Messages(value: toList(), hasher: &hasher)
452450
}
453451
}
454452

@@ -484,10 +482,10 @@ struct SK2ProductPurchaseOptionsMessage: Hashable {
484482
static func == (lhs: SK2ProductPurchaseOptionsMessage, rhs: SK2ProductPurchaseOptionsMessage)
485483
-> Bool
486484
{
487-
return deepEqualssk2_pigeon(lhs.toList(), rhs.toList())
485+
return deepEqualsStoreKit2Messages(lhs.toList(), rhs.toList())
488486
}
489487
func hash(into hasher: inout Hasher) {
490-
deepHashsk2_pigeon(value: toList(), hasher: &hasher)
488+
deepHashStoreKit2Messages(value: toList(), hasher: &hasher)
491489
}
492490
}
493491

@@ -549,10 +547,10 @@ struct SK2TransactionMessage: Hashable {
549547
]
550548
}
551549
static func == (lhs: SK2TransactionMessage, rhs: SK2TransactionMessage) -> Bool {
552-
return deepEqualssk2_pigeon(lhs.toList(), rhs.toList())
550+
return deepEqualsStoreKit2Messages(lhs.toList(), rhs.toList())
553551
}
554552
func hash(into hasher: inout Hasher) {
555-
deepHashsk2_pigeon(value: toList(), hasher: &hasher)
553+
deepHashStoreKit2Messages(value: toList(), hasher: &hasher)
556554
}
557555
}
558556

@@ -582,14 +580,14 @@ struct SK2ErrorMessage: Hashable {
582580
]
583581
}
584582
static func == (lhs: SK2ErrorMessage, rhs: SK2ErrorMessage) -> Bool {
585-
return deepEqualssk2_pigeon(lhs.toList(), rhs.toList())
583+
return deepEqualsStoreKit2Messages(lhs.toList(), rhs.toList())
586584
}
587585
func hash(into hasher: inout Hasher) {
588-
deepHashsk2_pigeon(value: toList(), hasher: &hasher)
586+
deepHashStoreKit2Messages(value: toList(), hasher: &hasher)
589587
}
590588
}
591589

592-
private class Sk2PigeonPigeonCodecReader: FlutterStandardReader {
590+
private class StoreKit2MessagesPigeonCodecReader: FlutterStandardReader {
593591
override func readValue(ofType type: UInt8) -> Any? {
594592
switch type {
595593
case 129:
@@ -648,7 +646,7 @@ private class Sk2PigeonPigeonCodecReader: FlutterStandardReader {
648646
}
649647
}
650648

651-
private class Sk2PigeonPigeonCodecWriter: FlutterStandardWriter {
649+
private class StoreKit2MessagesPigeonCodecWriter: FlutterStandardWriter {
652650
override func writeValue(_ value: Any) {
653651
if let value = value as? SK2ProductTypeMessage {
654652
super.writeByte(129)
@@ -701,18 +699,19 @@ private class Sk2PigeonPigeonCodecWriter: FlutterStandardWriter {
701699
}
702700
}
703701

704-
private class Sk2PigeonPigeonCodecReaderWriter: FlutterStandardReaderWriter {
702+
private class StoreKit2MessagesPigeonCodecReaderWriter: FlutterStandardReaderWriter {
705703
override func reader(with data: Data) -> FlutterStandardReader {
706-
return Sk2PigeonPigeonCodecReader(data: data)
704+
return StoreKit2MessagesPigeonCodecReader(data: data)
707705
}
708706

709707
override func writer(with data: NSMutableData) -> FlutterStandardWriter {
710-
return Sk2PigeonPigeonCodecWriter(data: data)
708+
return StoreKit2MessagesPigeonCodecWriter(data: data)
711709
}
712710
}
713711

714-
class Sk2PigeonPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
715-
static let shared = Sk2PigeonPigeonCodec(readerWriter: Sk2PigeonPigeonCodecReaderWriter())
712+
class StoreKit2MessagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
713+
static let shared = StoreKit2MessagesPigeonCodec(
714+
readerWriter: StoreKit2MessagesPigeonCodecReaderWriter())
716715
}
717716

718717
/// Generated protocol from Pigeon that represents a handler of messages from Flutter.
@@ -738,7 +737,7 @@ protocol InAppPurchase2API {
738737

739738
/// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
740739
class InAppPurchase2APISetup {
741-
static var codec: FlutterStandardMessageCodec { Sk2PigeonPigeonCodec.shared }
740+
static var codec: FlutterStandardMessageCodec { StoreKit2MessagesPigeonCodec.shared }
742741
/// Sets up an instance of `InAppPurchase2API` to handle messages through the `binaryMessenger`.
743742
static func setUp(
744743
binaryMessenger: FlutterBinaryMessenger, api: InAppPurchase2API?,
@@ -980,8 +979,8 @@ class InAppPurchase2CallbackAPI: InAppPurchase2CallbackAPIProtocol {
980979
self.binaryMessenger = binaryMessenger
981980
self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
982981
}
983-
var codec: Sk2PigeonPigeonCodec {
984-
return Sk2PigeonPigeonCodec.shared
982+
var codec: StoreKit2MessagesPigeonCodec {
983+
return StoreKit2MessagesPigeonCodec.shared
985984
}
986985
func onTransactionsUpdated(
987986
newTransactions newTransactionsArg: [SK2TransactionMessage],

packages/in_app_purchase/in_app_purchase_storekit/pigeons/sk2_pigeon.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:pigeon/pigeon.dart';
88
PigeonOptions(
99
dartOut: 'lib/src/sk2_pigeon.g.dart',
1010
swiftOut:
11-
'darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/sk2_pigeon.g.swift',
11+
'darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/StoreKit2Messages.g.swift',
1212
copyrightHeader: 'pigeons/copyright.txt',
1313
),
1414
)

0 commit comments

Comments
 (0)