From 9667994287cf0a63237c738a501d669b5ea6796b Mon Sep 17 00:00:00 2001 From: alejandro-all-win-software Date: Tue, 21 Jan 2025 10:13:12 -0600 Subject: [PATCH 01/10] feat: added swift package manager support to in_app_purchase_storekit --- ...in_app_purchase_storekit-Bridging-Header.h | 16 -------- .../darwin/in_app_purchase_storekit.podspec | 9 +++-- .../in_app_purchase_storekit/Package.swift | 38 +++++++++++++++++++ .../InAppPurchasePlugin.swift | 3 ++ .../Resources/PrivacyInfo.xcprivacy | 0 .../InAppPurchasePlugin+StoreKit2.swift | 2 + .../StoreKit2/StoreKit2Translators.swift | 0 .../StoreKit2/sk2_pigeon.g.swift | 26 ++++++------- .../storekit_objc}/FIAObjectTranslator.m | 0 .../storekit_objc}/FIAPPaymentQueueDelegate.m | 0 .../storekit_objc}/FIAPReceiptManager.m | 0 .../storekit_objc}/FIAPRequestHandler.m | 0 .../storekit_objc}/FIAPaymentQueueHandler.m | 0 .../storekit_objc}/FIATransactionCache.m | 0 .../Protocols/FLTMethodChannelProtocol.m | 11 ++++++ .../Protocols/FLTPaymentQueueProtocol.m | 4 ++ .../Protocols/FLTRequestHandlerProtocol.m | 4 ++ .../Protocols/FLTTransactionCacheProtocol.m | 4 ++ .../include/storekit_objc-umbrella.h | 18 +++++++++ .../include/storekit_objc.modulemap | 10 +++++ .../storekit_objc}/FIAObjectTranslator.h | 0 .../storekit_objc}/FIAPPaymentQueueDelegate.h | 5 +++ .../storekit_objc}/FIAPReceiptManager.h | 6 +++ .../storekit_objc}/FIAPRequestHandler.h | 6 ++- .../storekit_objc}/FIAPaymentQueueHandler.h | 6 +++ .../storekit_objc}/FIATransactionCache.h | 2 + .../Protocols/FLTMethodChannelProtocol.h | 1 + .../FLTPaymentQueueHandlerProtocol.h | 6 ++- .../Protocols/FLTPaymentQueueProtocol.h | 0 .../Protocols/FLTRequestHandlerProtocol.h | 0 .../Protocols/FLTTransactionCacheProtocol.h | 4 ++ .../storekit_objc}/in_app_purchase_storekit.h | 0 .../include/storekit_objc}/messages.g.h | 5 +-- .../Sources/storekit_objc}/messages.g.m | 2 +- .../lib/src/messages.g.dart | 2 +- .../lib/src/sk2_pigeon.g.dart | 2 +- .../pigeons/messages.dart | 6 ++- .../pigeons/sk2_pigeon.dart | 3 +- .../test/sk2_test_api.g.dart | 2 +- .../test/test_api.g.dart | 2 +- 40 files changed, 160 insertions(+), 45 deletions(-) delete mode 100644 packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/in_app_purchase_storekit-Bridging-Header.h create mode 100644 packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/in_app_purchase_storekit}/InAppPurchasePlugin.swift (99%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{ => in_app_purchase_storekit/Sources/in_app_purchase_storekit}/Resources/PrivacyInfo.xcprivacy (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/in_app_purchase_storekit}/StoreKit2/InAppPurchasePlugin+StoreKit2.swift (99%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/in_app_purchase_storekit}/StoreKit2/StoreKit2Translators.swift (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/in_app_purchase_storekit}/StoreKit2/sk2_pigeon.g.swift (96%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/FIAObjectTranslator.m (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/FIAPPaymentQueueDelegate.m (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/FIAPReceiptManager.m (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/FIAPRequestHandler.m (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/FIAPaymentQueueHandler.m (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/FIATransactionCache.m (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/Protocols/FLTMethodChannelProtocol.m (78%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/Protocols/FLTPaymentQueueProtocol.m (94%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/Protocols/FLTRequestHandlerProtocol.m (86%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/Protocols/FLTTransactionCacheProtocol.m (86%) create mode 100644 packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc-umbrella.h create mode 100644 packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc.modulemap rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/FIAObjectTranslator.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/FIAPPaymentQueueDelegate.h (80%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/FIAPReceiptManager.h (76%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/FIAPRequestHandler.h (82%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/FIAPaymentQueueHandler.h (71%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/FIATransactionCache.h (96%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/Protocols/FLTMethodChannelProtocol.h (96%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/Protocols/FLTPaymentQueueHandlerProtocol.h (98%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/Protocols/FLTPaymentQueueProtocol.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/Protocols/FLTRequestHandlerProtocol.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/Protocols/FLTTransactionCacheProtocol.h (91%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/in_app_purchase_storekit.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc}/messages.g.h (99%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/{Classes => in_app_purchase_storekit/Sources/storekit_objc}/messages.g.m (99%) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/in_app_purchase_storekit-Bridging-Header.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/in_app_purchase_storekit-Bridging-Header.h deleted file mode 100644 index e44e5cf4384..00000000000 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/in_app_purchase_storekit-Bridging-Header.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#import "FIAObjectTranslator.h" -#import "FIAPPaymentQueueDelegate.h" -#import "FIAPReceiptManager.h" -#import "FIAPRequestHandler.h" -#import "FIAPaymentQueueHandler.h" -#import "FIATransactionCache.h" -#import "FLTMethodChannelProtocol.h" -#import "FLTPaymentQueueHandlerProtocol.h" -#import "FLTPaymentQueueProtocol.h" -#import "FLTRequestHandlerProtocol.h" -#import "FLTTransactionCacheProtocol.h" -#import "messages.g.h" diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec index fed7865a615..3dd437419f6 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec @@ -17,14 +17,17 @@ Downloaded by pub (not CocoaPods). # Updating it before the package is published will cause a lint error and block the tree. s.documentation_url = 'https://pub.dev/packages/in_app_purchase' s.swift_version = '5.0' - s.source_files = 'Classes/**/*.{h,m,swift}' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'in_app_purchase_storekit/Sources/**/*.{h,m,swift}' + s.public_header_files = 'in_app_purchase_storekit/Sources/storekit_objc/include/**/*.h' + s.exclude_files = 'in_app_purchase_storekit/Sources/storekit_objc/include/*{-umbrella.h}' + s.ios.dependency 'Flutter' s.osx.dependency 'FlutterMacOS' s.ios.deployment_target = '12.0' s.osx.deployment_target = '10.15' + s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } - s.resource_bundles = {'in_app_purchase_storekit_privacy' => ['Resources/PrivacyInfo.xcprivacy']} + s.resource_bundles = {'in_app_purchase_storekit_privacy' => ['in_app_purchase_storekit/Sources/in_app_purchase_storekit/Resources/PrivacyInfo.xcprivacy']} s.xcconfig = { 'LIBRARY_SEARCH_PATHS' => '$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)/ $(SDKROOT)/usr/lib/swift', 'LD_RUNPATH_SEARCH_PATHS' => '/usr/lib/swift', diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift new file mode 100644 index 00000000000..0833169a947 --- /dev/null +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift @@ -0,0 +1,38 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import PackageDescription + +let package = Package( + name: "in_app_purchase_storekit", + platforms: [ + .iOS(.v12), + .macOS(.v10_15) + ], + products: [ + .library(name: "in-app-purchase-storekit", targets: ["in_app_purchase_storekit"]) + ], + dependencies: [], + targets: [ + .target( + name: "in_app_purchase_storekit", + dependencies: [ + "storekit_objc" + ], + resources: [ + .process("Resources/PrivacyInfo.xcprivacy") + ] + ), + .target( + name: "storekit_objc", + dependencies: [], + cSettings: [ + .headerSearchPath("include/storekit_objc") + ] + ) + ] +) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/InAppPurchasePlugin.swift b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift similarity index 99% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/InAppPurchasePlugin.swift rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift index 089f1c5ca53..e8de832522c 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/InAppPurchasePlugin.swift +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift @@ -4,6 +4,9 @@ import Foundation import StoreKit +#if canImport(storekit_objc) +import storekit_objc +#endif #if os(iOS) import Flutter diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Resources/PrivacyInfo.xcprivacy b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Resources/PrivacyInfo.xcprivacy rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/Resources/PrivacyInfo.xcprivacy diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/StoreKit2/InAppPurchasePlugin+StoreKit2.swift b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/InAppPurchasePlugin+StoreKit2.swift similarity index 99% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/StoreKit2/InAppPurchasePlugin+StoreKit2.swift rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/InAppPurchasePlugin+StoreKit2.swift index 672860beec6..05300e0c33d 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/StoreKit2/InAppPurchasePlugin+StoreKit2.swift +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/InAppPurchasePlugin+StoreKit2.swift @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import StoreKit + @available(iOS 15.0, macOS 12.0, *) extension InAppPurchasePlugin: InAppPurchase2API { diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/StoreKit2/StoreKit2Translators.swift b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/StoreKit2Translators.swift similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/StoreKit2/StoreKit2Translators.swift rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/StoreKit2Translators.swift diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/StoreKit2/sk2_pigeon.g.swift b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/sk2_pigeon.g.swift similarity index 96% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/StoreKit2/sk2_pigeon.g.swift rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/sk2_pigeon.g.swift index 5defe53680e..25c848efda2 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/StoreKit2/sk2_pigeon.g.swift +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/sk2_pigeon.g.swift @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v22.6.0), do not edit directly. +// Autogenerated from Pigeon (v22.7.3), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation @@ -392,7 +392,7 @@ struct SK2ErrorMessage { } } -private class sk2_pigeonPigeonCodecReader: FlutterStandardReader { +private class Sk2PigeonPigeonCodecReader: FlutterStandardReader { override func readValue(ofType type: UInt8) -> Any? { switch type { case 129: @@ -447,7 +447,7 @@ private class sk2_pigeonPigeonCodecReader: FlutterStandardReader { } } -private class sk2_pigeonPigeonCodecWriter: FlutterStandardWriter { +private class Sk2PigeonPigeonCodecWriter: FlutterStandardWriter { override func writeValue(_ value: Any) { if let value = value as? SK2ProductTypeMessage { super.writeByte(129) @@ -494,18 +494,18 @@ private class sk2_pigeonPigeonCodecWriter: FlutterStandardWriter { } } -private class sk2_pigeonPigeonCodecReaderWriter: FlutterStandardReaderWriter { +private class Sk2PigeonPigeonCodecReaderWriter: FlutterStandardReaderWriter { override func reader(with data: Data) -> FlutterStandardReader { - return sk2_pigeonPigeonCodecReader(data: data) + return Sk2PigeonPigeonCodecReader(data: data) } override func writer(with data: NSMutableData) -> FlutterStandardWriter { - return sk2_pigeonPigeonCodecWriter(data: data) + return Sk2PigeonPigeonCodecWriter(data: data) } } -class sk2_pigeonPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable { - static let shared = sk2_pigeonPigeonCodec(readerWriter: sk2_pigeonPigeonCodecReaderWriter()) +class Sk2PigeonPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable { + static let shared = Sk2PigeonPigeonCodec(readerWriter: Sk2PigeonPigeonCodecReaderWriter()) } /// Generated protocol from Pigeon that represents a handler of messages from Flutter. @@ -525,11 +525,11 @@ protocol InAppPurchase2API { /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. class InAppPurchase2APISetup { - static var codec: FlutterStandardMessageCodec { sk2_pigeonPigeonCodec.shared } + static var codec: FlutterStandardMessageCodec { Sk2PigeonPigeonCodec.shared } /// Sets up an instance of `InAppPurchase2API` to handle messages through the `binaryMessenger`. static func setUp( - binaryMessenger: FlutterBinaryMessenger, - api: InAppPurchase2API?, messageChannelSuffix: String = "" + binaryMessenger: FlutterBinaryMessenger, api: InAppPurchase2API?, + messageChannelSuffix: String = "" ) { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let canMakePaymentsChannel = FlutterBasicMessageChannel( @@ -691,8 +691,8 @@ class InAppPurchase2CallbackAPI: InAppPurchase2CallbackAPIProtocol { self.binaryMessenger = binaryMessenger self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" } - var codec: sk2_pigeonPigeonCodec { - return sk2_pigeonPigeonCodec.shared + var codec: Sk2PigeonPigeonCodec { + return Sk2PigeonPigeonCodec.shared } func onTransactionsUpdated( newTransactions newTransactionsArg: [SK2TransactionMessage], diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAObjectTranslator.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAObjectTranslator.m similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAObjectTranslator.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAObjectTranslator.m diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPPaymentQueueDelegate.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPPaymentQueueDelegate.m similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPPaymentQueueDelegate.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPPaymentQueueDelegate.m diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPReceiptManager.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPReceiptManager.m similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPReceiptManager.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPReceiptManager.m diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPRequestHandler.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPRequestHandler.m similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPRequestHandler.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPRequestHandler.m diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPaymentQueueHandler.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPaymentQueueHandler.m similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPaymentQueueHandler.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPaymentQueueHandler.m diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIATransactionCache.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIATransactionCache.m similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIATransactionCache.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIATransactionCache.m diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTMethodChannelProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTMethodChannelProtocol.m similarity index 78% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTMethodChannelProtocol.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTMethodChannelProtocol.m index 17e0e0803fc..1b80a10e36d 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTMethodChannelProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTMethodChannelProtocol.m @@ -2,7 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include +#if TARGET_OS_OSX +#import +#else +#import +#endif + +#if __has_include() +#import +#else #import "FLTMethodChannelProtocol.h" +#endif @interface DefaultMethodChannel () /// The wrapped FlutterMethodChannel diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTPaymentQueueProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTPaymentQueueProtocol.m similarity index 94% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTPaymentQueueProtocol.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTPaymentQueueProtocol.m index 943bdc2cf39..2d478a15458 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTPaymentQueueProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTPaymentQueueProtocol.m @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if __has_include() +#import +#else #import "FLTPaymentQueueProtocol.h" +#endif @interface DefaultPaymentQueue () /// The wrapped SKPaymentQueue diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTRequestHandlerProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTRequestHandlerProtocol.m similarity index 86% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTRequestHandlerProtocol.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTRequestHandlerProtocol.m index e1714673489..b2c602ae53e 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTRequestHandlerProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTRequestHandlerProtocol.m @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if __has_include() +#import +#else #import "FLTRequestHandlerProtocol.h" +#endif #import #import "FIAPRequestHandler.h" diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTTransactionCacheProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTTransactionCacheProtocol.m similarity index 86% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTTransactionCacheProtocol.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTTransactionCacheProtocol.m index 3ed268e337c..6c5e2fb4387 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTTransactionCacheProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTTransactionCacheProtocol.m @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if __has_include() +#import +#else #import "FLTTransactionCacheProtocol.h" +#endif @interface DefaultTransactionCache () /// The wrapped FIATransactionCache diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc-umbrella.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc-umbrella.h new file mode 100644 index 00000000000..ef74fce958f --- /dev/null +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc-umbrella.h @@ -0,0 +1,18 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +#import +#import +#import +#import +#import +#import +#import +#import + +// MARK: - Protocols +#import +#import +#import +#import +#import diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc.modulemap b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc.modulemap new file mode 100644 index 00000000000..988213c5530 --- /dev/null +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc.modulemap @@ -0,0 +1,10 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +framework module storekit_objc { + umbrella header "storekit_objc-umbrella.h" + + export * + module * { export * } +} diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAObjectTranslator.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAObjectTranslator.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAObjectTranslator.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAObjectTranslator.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPPaymentQueueDelegate.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPPaymentQueueDelegate.h similarity index 80% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPPaymentQueueDelegate.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPPaymentQueueDelegate.h index 522c081923d..7b8d3c92640 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPPaymentQueueDelegate.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPPaymentQueueDelegate.h @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include #if TARGET_OS_OSX #import #else @@ -9,7 +10,11 @@ #endif #import #import +#if __has_include("Protocols/FLTMethodChannelProtocol.h") +#import "Protocols/FLTMethodChannelProtocol.h" +#else #import "FLTMethodChannelProtocol.h" +#endif NS_ASSUME_NONNULL_BEGIN diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPReceiptManager.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPReceiptManager.h similarity index 76% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPReceiptManager.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPReceiptManager.h index 94020ff2348..0303328644b 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPReceiptManager.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPReceiptManager.h @@ -2,6 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include +#if TARGET_OS_OSX +#import +#else +#import +#endif #import NS_ASSUME_NONNULL_BEGIN diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPRequestHandler.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h similarity index 82% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPRequestHandler.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h index ea6e2b736af..b595a1a3e5b 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPRequestHandler.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +#if __has_include("Protocols/FLTRequestHandlerProtocol.h") +#import "Protocols/FLTRequestHandlerProtocol.h" +#else +#import "FLTRequestHandlerProtocol.h" +#endif #import #import diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPaymentQueueHandler.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPaymentQueueHandler.h similarity index 71% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPaymentQueueHandler.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPaymentQueueHandler.h index 68ddcaa7651..1e8ee297697 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAPaymentQueueHandler.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPaymentQueueHandler.h @@ -5,9 +5,15 @@ #import #import #import "FIATransactionCache.h" +#if __has_include("Protocols/FLTPaymentQueueHandlerProtocol.h") +#import "Protocols/FLTPaymentQueueHandlerProtocol.h" +#import "Protocols/FLTPaymentQueueProtocol.h" +#import "Protocols/FLTTransactionCacheProtocol.h" +#else #import "FLTPaymentQueueHandlerProtocol.h" #import "FLTPaymentQueueProtocol.h" #import "FLTTransactionCacheProtocol.h" +#endif @class SKPaymentTransaction; diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIATransactionCache.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIATransactionCache.h similarity index 96% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIATransactionCache.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIATransactionCache.h index dea3c2d85d1..0d7b720527e 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIATransactionCache.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIATransactionCache.h @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import + NS_ASSUME_NONNULL_BEGIN typedef NS_ENUM(NSUInteger, TransactionCacheKey) { diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTMethodChannelProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTMethodChannelProtocol.h similarity index 96% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTMethodChannelProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTMethodChannelProtocol.h index 12856435208..b25961129b0 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTMethodChannelProtocol.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTMethodChannelProtocol.h @@ -7,6 +7,7 @@ #else #import #endif +#import NS_ASSUME_NONNULL_BEGIN /// A protocol that wraps FlutterMethodChannel. diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTPaymentQueueHandlerProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTPaymentQueueHandlerProtocol.h similarity index 98% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTPaymentQueueHandlerProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTPaymentQueueHandlerProtocol.h index f11b1a09ce4..863283ed70e 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTPaymentQueueHandlerProtocol.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTPaymentQueueHandlerProtocol.h @@ -2,8 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +#if __has_include() +#import +#else #import "FIATransactionCache.h" +#endif +#import #import "FLTPaymentQueueProtocol.h" #import "FLTTransactionCacheProtocol.h" diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTPaymentQueueProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTPaymentQueueProtocol.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTPaymentQueueProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTPaymentQueueProtocol.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTRequestHandlerProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTRequestHandlerProtocol.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTRequestHandlerProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTRequestHandlerProtocol.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTTransactionCacheProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTTransactionCacheProtocol.h similarity index 91% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTTransactionCacheProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTTransactionCacheProtocol.h index f7a58b3f2e8..ee0dd81fb59 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/Protocols/FLTTransactionCacheProtocol.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTTransactionCacheProtocol.h @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if __has_include() +#import +#else #import "FIATransactionCache.h" +#endif #if TARGET_OS_OSX #import #else diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/in_app_purchase_storekit.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/in_app_purchase_storekit.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/in_app_purchase_storekit.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/in_app_purchase_storekit.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/messages.g.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/messages.g.h similarity index 99% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/messages.g.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/messages.g.h index 3ec07a94628..586a789a911 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/messages.g.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/messages.g.h @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v22.6.0), do not edit directly. +// Autogenerated from Pigeon (v22.7.3), do not edit directly. // See also: https://pub.dev/packages/pigeon #import @@ -67,8 +67,7 @@ typedef NS_ENUM(NSUInteger, FIASKProductDiscountTypeMessage) { typedef NS_ENUM(NSUInteger, FIASKProductDiscountPaymentModeMessage) { /// Allows user to pay the discounted price at each payment period. FIASKProductDiscountPaymentModeMessagePayAsYouGo = 0, - /// Allows user to pay the discounted price upfront and receive the product - /// for the rest of time + /// Allows user to pay the discounted price upfront and receive the product for the rest of time /// that was paid for. FIASKProductDiscountPaymentModeMessagePayUpFront = 1, /// User pays nothing during the discounted period. diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/messages.g.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m similarity index 99% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/messages.g.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m index 50963e67039..a282c541d68 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/messages.g.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v22.6.0), do not edit directly. +// Autogenerated from Pigeon (v22.7.3), do not edit directly. // See also: https://pub.dev/packages/pigeon #import "messages.g.h" diff --git a/packages/in_app_purchase/in_app_purchase_storekit/lib/src/messages.g.dart b/packages/in_app_purchase/in_app_purchase_storekit/lib/src/messages.g.dart index f5938cf3c25..bd675a296cb 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/lib/src/messages.g.dart +++ b/packages/in_app_purchase/in_app_purchase_storekit/lib/src/messages.g.dart @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v22.6.0), do not edit directly. +// Autogenerated from Pigeon (v22.7.3), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/packages/in_app_purchase/in_app_purchase_storekit/lib/src/sk2_pigeon.g.dart b/packages/in_app_purchase/in_app_purchase_storekit/lib/src/sk2_pigeon.g.dart index c4476badce3..749c50f9fff 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/lib/src/sk2_pigeon.g.dart +++ b/packages/in_app_purchase/in_app_purchase_storekit/lib/src/sk2_pigeon.g.dart @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v22.6.0), do not edit directly. +// Autogenerated from Pigeon (v22.7.3), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart b/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart index 774ab69e220..64c25c24f54 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart +++ b/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart @@ -7,8 +7,10 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/src/messages.g.dart', dartTestOut: 'test/test_api.g.dart', - objcHeaderOut: 'darwin/Classes/messages.g.h', - objcSourceOut: 'darwin/Classes/messages.g.m', + objcHeaderOut: + 'darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/messages.g.h', + objcSourceOut: + 'darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/messages.g.m', objcOptions: ObjcOptions( prefix: 'FIA', ), diff --git a/packages/in_app_purchase/in_app_purchase_storekit/pigeons/sk2_pigeon.dart b/packages/in_app_purchase/in_app_purchase_storekit/pigeons/sk2_pigeon.dart index c6493ce17ee..cfb92b57b92 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/pigeons/sk2_pigeon.dart +++ b/packages/in_app_purchase/in_app_purchase_storekit/pigeons/sk2_pigeon.dart @@ -7,7 +7,8 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/src/sk2_pigeon.g.dart', dartTestOut: 'test/sk2_test_api.g.dart', - swiftOut: 'darwin/Classes/StoreKit2/sk2_pigeon.g.swift', + swiftOut: + 'darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/sk2_pigeon.g.swift', copyrightHeader: 'pigeons/copyright.txt', )) enum SK2ProductTypeMessage { diff --git a/packages/in_app_purchase/in_app_purchase_storekit/test/sk2_test_api.g.dart b/packages/in_app_purchase/in_app_purchase_storekit/test/sk2_test_api.g.dart index 5c595d45c09..3a51df7105e 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/test/sk2_test_api.g.dart +++ b/packages/in_app_purchase/in_app_purchase_storekit/test/sk2_test_api.g.dart @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v22.6.0), do not edit directly. +// Autogenerated from Pigeon (v22.7.3), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import, no_leading_underscores_for_local_identifiers // ignore_for_file: avoid_relative_lib_imports diff --git a/packages/in_app_purchase/in_app_purchase_storekit/test/test_api.g.dart b/packages/in_app_purchase/in_app_purchase_storekit/test/test_api.g.dart index 916b37ef1ba..9b3ea2a14d6 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/test/test_api.g.dart +++ b/packages/in_app_purchase/in_app_purchase_storekit/test/test_api.g.dart @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v22.6.0), do not edit directly. +// Autogenerated from Pigeon (v22.7.3), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import, no_leading_underscores_for_local_identifiers // ignore_for_file: avoid_relative_lib_imports From 7f39afdc016698e140234724315fa5a41c8d16d1 Mon Sep 17 00:00:00 2001 From: alejandro-all-win-software Date: Tue, 21 Jan 2025 10:19:14 -0600 Subject: [PATCH 02/10] chore: bump pubspec version --- .../in_app_purchase/in_app_purchase_storekit/CHANGELOG.md | 4 ++++ .../in_app_purchase/in_app_purchase_storekit/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md b/packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md index 8952b5a0be3..21796591786 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md +++ b/packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.21 + +* Adds Swift Package Manager compatibility. + ## 0.3.20+4 * Exposes `jsonRepresentation` field for transactions. diff --git a/packages/in_app_purchase/in_app_purchase_storekit/pubspec.yaml b/packages/in_app_purchase/in_app_purchase_storekit/pubspec.yaml index 07adfb8ab1b..c6d973ce1f0 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/pubspec.yaml +++ b/packages/in_app_purchase/in_app_purchase_storekit/pubspec.yaml @@ -2,7 +2,7 @@ name: in_app_purchase_storekit description: An implementation for the iOS and macOS platforms of the Flutter `in_app_purchase` plugin. This uses the StoreKit Framework. repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_storekit issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 0.3.20+4 +version: 0.3.21 environment: sdk: ^3.4.0 From f89ba52b87b16d57a39a927369f7f2688e0c7f9c Mon Sep 17 00:00:00 2001 From: alejandro-all-win-software Date: Tue, 21 Jan 2025 11:04:35 -0600 Subject: [PATCH 03/10] fix: tests --- .../example/shared/RunnerTests/Stubs.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h b/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h index 14bbed8ceea..39989bff22f 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h @@ -4,12 +4,21 @@ #import #import +#if __has_include() +#import +#import "Protocols/FLTMethodChannelProtocol.h" +#import "Protocols/FLTPaymentQueueHandlerProtocol.h" +#import "Protocols/FLTPaymentQueueProtocol.h" +#import "Protocols/FLTRequestHandlerProtocol.h" +#import "Protocols/FLTTransactionCacheProtocol.h" +#else #import "FIATransactionCache.h" #import "FLTMethodChannelProtocol.h" #import "FLTPaymentQueueHandlerProtocol.h" #import "FLTPaymentQueueProtocol.h" #import "FLTRequestHandlerProtocol.h" #import "FLTTransactionCacheProtocol.h" +#endif @import in_app_purchase_storekit; From 046cfb7e07a1aa8aee949484d1e9dfd53543d7d9 Mon Sep 17 00:00:00 2001 From: alejandro-all-win-software Date: Tue, 21 Jan 2025 12:54:43 -0600 Subject: [PATCH 04/10] chore: format swift files --- .../in_app_purchase_storekit/Package.swift | 54 +++++++++---------- .../InAppPurchasePlugin.swift | 5 +- .../example/shared/RunnerTests/Stubs.h | 10 ++-- 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift index 0833169a947..845c19a6ecd 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift @@ -8,31 +8,31 @@ import PackageDescription let package = Package( - name: "in_app_purchase_storekit", - platforms: [ - .iOS(.v12), - .macOS(.v10_15) - ], - products: [ - .library(name: "in-app-purchase-storekit", targets: ["in_app_purchase_storekit"]) - ], - dependencies: [], - targets: [ - .target( - name: "in_app_purchase_storekit", - dependencies: [ - "storekit_objc" - ], - resources: [ - .process("Resources/PrivacyInfo.xcprivacy") - ] - ), - .target( - name: "storekit_objc", - dependencies: [], - cSettings: [ - .headerSearchPath("include/storekit_objc") - ] - ) - ] + name: "in_app_purchase_storekit", + platforms: [ + .iOS(.v12), + .macOS(.v10_15), + ], + products: [ + .library(name: "in-app-purchase-storekit", targets: ["in_app_purchase_storekit"]) + ], + dependencies: [], + targets: [ + .target( + name: "in_app_purchase_storekit", + dependencies: [ + "storekit_objc" + ], + resources: [ + .process("Resources/PrivacyInfo.xcprivacy") + ] + ), + .target( + name: "storekit_objc", + dependencies: [], + cSettings: [ + .headerSearchPath("include/storekit_objc") + ] + ), + ] ) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift index e8de832522c..830acf141f0 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift @@ -4,8 +4,9 @@ import Foundation import StoreKit + #if canImport(storekit_objc) -import storekit_objc + import storekit_objc #endif #if os(iOS) @@ -244,7 +245,7 @@ public class InAppPurchasePlugin: NSObject, FlutterPlugin, FIAInAppPurchaseAPI { // TODO(louisehsu): This is a workaround for objc pigeon's NSNull support. Once we move to swift pigeon, this can be removed. let castedFinishMap: [String: String] = finishMap.compactMapValues { value in - if let _ = value as? NSNull { + if value as? NSNull != nil { return nil } else if let stringValue = value as? String { return stringValue diff --git a/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h b/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h index 39989bff22f..200df34f761 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h @@ -6,11 +6,11 @@ #import #if __has_include() #import -#import "Protocols/FLTMethodChannelProtocol.h" -#import "Protocols/FLTPaymentQueueHandlerProtocol.h" -#import "Protocols/FLTPaymentQueueProtocol.h" -#import "Protocols/FLTRequestHandlerProtocol.h" -#import "Protocols/FLTTransactionCacheProtocol.h" +#import +#import +#import +#import +#import #else #import "FIATransactionCache.h" #import "FLTMethodChannelProtocol.h" From 6f3f861e2bf8596299838901930594142ef1e836 Mon Sep 17 00:00:00 2001 From: alejandro-all-win-software Date: Tue, 21 Jan 2025 16:28:08 -0600 Subject: [PATCH 05/10] chore: changed to relative imports --- .../darwin/in_app_purchase_storekit.podspec | 1 - .../storekit_objc/FIAObjectTranslator.m | 2 +- .../storekit_objc/FIAPPaymentQueueDelegate.m | 4 ++-- .../Sources/storekit_objc/FIAPReceiptManager.m | 4 ++-- .../Sources/storekit_objc/FIAPRequestHandler.m | 2 +- .../storekit_objc/FIAPaymentQueueHandler.m | 6 +++--- .../storekit_objc/FIATransactionCache.m | 2 +- .../Protocols/FLTMethodChannelProtocol.m | 7 ++----- .../Protocols/FLTPaymentQueueProtocol.m | 6 +----- .../Protocols/FLTRequestHandlerProtocol.m | 8 ++------ .../Protocols/FLTTransactionCacheProtocol.m | 6 +----- .../include/storekit_objc-umbrella.h | 18 ------------------ .../include/storekit_objc.modulemap | 10 ---------- .../storekit_objc/FIAPPaymentQueueDelegate.h | 5 +---- .../include/storekit_objc/FIAPReceiptManager.h | 1 + .../include/storekit_objc/FIAPRequestHandler.h | 4 ---- .../storekit_objc/FIAPaymentQueueHandler.h | 6 ------ .../{Protocols => }/FLTMethodChannelProtocol.h | 2 ++ .../FLTPaymentQueueHandlerProtocol.h | 4 ---- .../{Protocols => }/FLTPaymentQueueProtocol.h | 0 .../FLTRequestHandlerProtocol.h | 0 .../FLTTransactionCacheProtocol.h | 6 ++---- .../Sources/storekit_objc/messages.g.m | 2 +- .../pigeons/messages.dart | 5 +++-- 24 files changed, 26 insertions(+), 85 deletions(-) delete mode 100644 packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc-umbrella.h delete mode 100644 packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc.modulemap rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/{Protocols => }/FLTMethodChannelProtocol.h (97%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/{Protocols => }/FLTPaymentQueueHandlerProtocol.h (98%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/{Protocols => }/FLTPaymentQueueProtocol.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/{Protocols => }/FLTRequestHandlerProtocol.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/{Protocols => }/FLTTransactionCacheProtocol.h (91%) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec index 3dd437419f6..239e543ff8f 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec @@ -19,7 +19,6 @@ Downloaded by pub (not CocoaPods). s.swift_version = '5.0' s.source_files = 'in_app_purchase_storekit/Sources/**/*.{h,m,swift}' s.public_header_files = 'in_app_purchase_storekit/Sources/storekit_objc/include/**/*.h' - s.exclude_files = 'in_app_purchase_storekit/Sources/storekit_objc/include/*{-umbrella.h}' s.ios.dependency 'Flutter' s.osx.dependency 'FlutterMacOS' diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAObjectTranslator.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAObjectTranslator.m index 04f9817250b..14ea497d8e0 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAObjectTranslator.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAObjectTranslator.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FIAObjectTranslator.h" +#import "./include/storekit_objc/FIAObjectTranslator.h" #pragma mark - SKProduct Coders diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPPaymentQueueDelegate.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPPaymentQueueDelegate.m index d0efb06861a..1c54fd457a3 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPPaymentQueueDelegate.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPPaymentQueueDelegate.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FIAPPaymentQueueDelegate.h" -#import "FIAObjectTranslator.h" +#import "./include/storekit_objc/FIAPPaymentQueueDelegate.h" +#import "./include/storekit_objc/FIAObjectTranslator.h" @interface FIAPPaymentQueueDelegate () diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPReceiptManager.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPReceiptManager.m index 503eb0fcf3e..d49f3ac725e 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPReceiptManager.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPReceiptManager.m @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FIAPReceiptManager.h" +#import "./include/storekit_objc/FIAPReceiptManager.h" #if TARGET_OS_OSX #import #else #import #endif -#import "FIAObjectTranslator.h" +#import "./include/storekit_objc/FIAObjectTranslator.h" @interface FIAPReceiptManager () // Gets the receipt file data from the location of the url. Can be nil if diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPRequestHandler.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPRequestHandler.m index d2ef6829eec..4dd1df5924b 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPRequestHandler.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPRequestHandler.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FIAPRequestHandler.h" +#import "./include/storekit_objc/FIAPRequestHandler.h" #import #pragma mark - Main Handler diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPaymentQueueHandler.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPaymentQueueHandler.m index e221ce0695c..3ca5584b2bf 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPaymentQueueHandler.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPaymentQueueHandler.m @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FIAPaymentQueueHandler.h" -#import "FIAPPaymentQueueDelegate.h" -#import "FIATransactionCache.h" +#import "./include/storekit_objc/FIAPaymentQueueHandler.h" +#import "./include/storekit_objc/FIAPPaymentQueueDelegate.h" +#import "./include/storekit_objc/FIATransactionCache.h" @interface FIAPaymentQueueHandler () diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIATransactionCache.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIATransactionCache.m index f80b9c40c7b..22850ec68d3 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIATransactionCache.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIATransactionCache.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FIATransactionCache.h" +#import "./include/storekit_objc/FIATransactionCache.h" @interface FIATransactionCache () diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTMethodChannelProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTMethodChannelProtocol.m index 1b80a10e36d..a07ea074ac7 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTMethodChannelProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTMethodChannelProtocol.m @@ -3,17 +3,14 @@ // found in the LICENSE file. #include + #if TARGET_OS_OSX #import #else #import #endif -#if __has_include() -#import -#else -#import "FLTMethodChannelProtocol.h" -#endif +#import "../include/storekit_objc/FLTMethodChannelProtocol.h" @interface DefaultMethodChannel () /// The wrapped FlutterMethodChannel diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTPaymentQueueProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTPaymentQueueProtocol.m index 2d478a15458..bc53e781450 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTPaymentQueueProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTPaymentQueueProtocol.m @@ -2,11 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if __has_include() -#import -#else -#import "FLTPaymentQueueProtocol.h" -#endif +#import "../include/storekit_objc/FLTPaymentQueueProtocol.h" @interface DefaultPaymentQueue () /// The wrapped SKPaymentQueue diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTRequestHandlerProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTRequestHandlerProtocol.m index b2c602ae53e..f7ad0c62f50 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTRequestHandlerProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTRequestHandlerProtocol.m @@ -2,13 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if __has_include() -#import -#else -#import "FLTRequestHandlerProtocol.h" -#endif +#import "../include/storekit_objc/FLTRequestHandlerProtocol.h" #import -#import "FIAPRequestHandler.h" +#import "../include/storekit_objc/FIAPRequestHandler.h" @interface DefaultRequestHandler () /// The wrapped FIAPRequestHandler diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTTransactionCacheProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTTransactionCacheProtocol.m index 6c5e2fb4387..998ceca17ba 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTTransactionCacheProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTTransactionCacheProtocol.m @@ -2,11 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if __has_include() -#import -#else -#import "FLTTransactionCacheProtocol.h" -#endif +#import "../include/storekit_objc/FLTTransactionCacheProtocol.h" @interface DefaultTransactionCache () /// The wrapped FIATransactionCache diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc-umbrella.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc-umbrella.h deleted file mode 100644 index ef74fce958f..00000000000 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc-umbrella.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#import -#import -#import -#import -#import -#import -#import -#import - -// MARK: - Protocols -#import -#import -#import -#import -#import diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc.modulemap b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc.modulemap deleted file mode 100644 index 988213c5530..00000000000 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc.modulemap +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -framework module storekit_objc { - umbrella header "storekit_objc-umbrella.h" - - export * - module * { export * } -} diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPPaymentQueueDelegate.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPPaymentQueueDelegate.h index 7b8d3c92640..2a99de17906 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPPaymentQueueDelegate.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPPaymentQueueDelegate.h @@ -3,6 +3,7 @@ // found in the LICENSE file. #include + #if TARGET_OS_OSX #import #else @@ -10,11 +11,7 @@ #endif #import #import -#if __has_include("Protocols/FLTMethodChannelProtocol.h") -#import "Protocols/FLTMethodChannelProtocol.h" -#else #import "FLTMethodChannelProtocol.h" -#endif NS_ASSUME_NONNULL_BEGIN diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPReceiptManager.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPReceiptManager.h index 0303328644b..b04bc98a2ba 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPReceiptManager.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPReceiptManager.h @@ -3,6 +3,7 @@ // found in the LICENSE file. #include + #if TARGET_OS_OSX #import #else diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h index b595a1a3e5b..32e5fd9c39a 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h @@ -2,11 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if __has_include("Protocols/FLTRequestHandlerProtocol.h") -#import "Protocols/FLTRequestHandlerProtocol.h" -#else #import "FLTRequestHandlerProtocol.h" -#endif #import #import diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPaymentQueueHandler.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPaymentQueueHandler.h index 1e8ee297697..68ddcaa7651 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPaymentQueueHandler.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPaymentQueueHandler.h @@ -5,15 +5,9 @@ #import #import #import "FIATransactionCache.h" -#if __has_include("Protocols/FLTPaymentQueueHandlerProtocol.h") -#import "Protocols/FLTPaymentQueueHandlerProtocol.h" -#import "Protocols/FLTPaymentQueueProtocol.h" -#import "Protocols/FLTTransactionCacheProtocol.h" -#else #import "FLTPaymentQueueHandlerProtocol.h" #import "FLTPaymentQueueProtocol.h" #import "FLTTransactionCacheProtocol.h" -#endif @class SKPaymentTransaction; diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTMethodChannelProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTMethodChannelProtocol.h similarity index 97% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTMethodChannelProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTMethodChannelProtocol.h index b25961129b0..b5a15f818a4 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTMethodChannelProtocol.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTMethodChannelProtocol.h @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #if TARGET_OS_OSX #import #else diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTPaymentQueueHandlerProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueHandlerProtocol.h similarity index 98% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTPaymentQueueHandlerProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueHandlerProtocol.h index 863283ed70e..2750f30883c 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTPaymentQueueHandlerProtocol.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueHandlerProtocol.h @@ -2,11 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if __has_include() -#import -#else #import "FIATransactionCache.h" -#endif #import #import "FLTPaymentQueueProtocol.h" #import "FLTTransactionCacheProtocol.h" diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTPaymentQueueProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueProtocol.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTPaymentQueueProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueProtocol.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTRequestHandlerProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTRequestHandlerProtocol.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTRequestHandlerProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTRequestHandlerProtocol.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTTransactionCacheProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTTransactionCacheProtocol.h similarity index 91% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTTransactionCacheProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTTransactionCacheProtocol.h index ee0dd81fb59..d0dc9302fa3 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/Protocols/FLTTransactionCacheProtocol.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTTransactionCacheProtocol.h @@ -2,11 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if __has_include() -#import -#else +#include #import "FIATransactionCache.h" -#endif + #if TARGET_OS_OSX #import #else diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m index a282c541d68..23d582e57c6 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m @@ -4,7 +4,7 @@ // Autogenerated from Pigeon (v22.7.3), do not edit directly. // See also: https://pub.dev/packages/pigeon -#import "messages.g.h" +#import "./include/storekit_objc/messages.g.h" #if TARGET_OS_OSX #import diff --git a/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart b/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart index 64c25c24f54..ebc4f4b014d 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart +++ b/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart @@ -8,11 +8,12 @@ import 'package:pigeon/pigeon.dart'; dartOut: 'lib/src/messages.g.dart', dartTestOut: 'test/test_api.g.dart', objcHeaderOut: - 'darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/messages.g.h', + 'darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/messages.g.h', objcSourceOut: - 'darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/messages.g.m', + 'darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m', objcOptions: ObjcOptions( prefix: 'FIA', + headerIncludePath: './include/storekit_objc/messages.g.h', ), copyrightHeader: 'pigeons/copyright.txt', )) From 2c0cff273a19872208b79160eba8277139643ecb Mon Sep 17 00:00:00 2001 From: alejandro-all-win-software Date: Tue, 21 Jan 2025 17:35:18 -0600 Subject: [PATCH 06/10] feedback --- .../darwin/in_app_purchase_storekit/Package.swift | 1 + .../include/storekit_objc/FIAPRequestHandler.h | 2 +- .../storekit_objc/FLTPaymentQueueHandlerProtocol.h | 2 +- .../example/shared/RunnerTests/Stubs.h | 13 ++++--------- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift index 845c19a6ecd..5041bf8547a 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift @@ -30,6 +30,7 @@ let package = Package( .target( name: "storekit_objc", dependencies: [], + publicHeadersPath: "include/storekit_objc", cSettings: [ .headerSearchPath("include/storekit_objc") ] diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h index 32e5fd9c39a..eded6f53dd4 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTRequestHandlerProtocol.h" #import #import +#import "FLTRequestHandlerProtocol.h" NS_ASSUME_NONNULL_BEGIN diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueHandlerProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueHandlerProtocol.h index 2750f30883c..f11b1a09ce4 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueHandlerProtocol.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueHandlerProtocol.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FIATransactionCache.h" #import +#import "FIATransactionCache.h" #import "FLTPaymentQueueProtocol.h" #import "FLTTransactionCacheProtocol.h" diff --git a/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h b/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h index 200df34f761..cd631959ec6 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h @@ -4,23 +4,18 @@ #import #import -#if __has_include() -#import -#import -#import -#import -#import -#import -#else #import "FIATransactionCache.h" #import "FLTMethodChannelProtocol.h" #import "FLTPaymentQueueHandlerProtocol.h" #import "FLTPaymentQueueProtocol.h" #import "FLTRequestHandlerProtocol.h" #import "FLTTransactionCacheProtocol.h" -#endif +#if __has_include() @import in_app_purchase_storekit; +#else +@import storekit_objc; +#endif NS_ASSUME_NONNULL_BEGIN API_AVAILABLE(ios(11.2), macos(10.13.2)) From 800d979216985feb3ab777fa5eb56fb9396a61d8 Mon Sep 17 00:00:00 2001 From: alejandro-all-win-software Date: Fri, 24 Jan 2025 13:55:20 -0600 Subject: [PATCH 07/10] feedback --- .../darwin/in_app_purchase_storekit.podspec | 2 +- .../darwin/in_app_purchase_storekit/Package.swift | 8 ++++---- .../in_app_purchase_storekit/InAppPurchasePlugin.swift | 4 ++-- .../FIAObjectTranslator.m | 2 +- .../FIAPPaymentQueueDelegate.m | 4 ++-- .../FIAPReceiptManager.m | 5 +++-- .../FIAPRequestHandler.m | 2 +- .../FIAPaymentQueueHandler.m | 6 +++--- .../FIATransactionCache.m | 2 +- .../Protocols/FLTMethodChannelProtocol.m | 4 +--- .../Protocols/FLTPaymentQueueProtocol.m | 2 +- .../Protocols/FLTRequestHandlerProtocol.m | 4 ++-- .../Protocols/FLTTransactionCacheProtocol.m | 2 +- .../in_app_purchase_storekit_objc}/FIAObjectTranslator.h | 0 .../FIAPPaymentQueueDelegate.h | 0 .../in_app_purchase_storekit_objc}/FIAPReceiptManager.h | 0 .../in_app_purchase_storekit_objc}/FIAPRequestHandler.h | 0 .../FIAPaymentQueueHandler.h | 0 .../in_app_purchase_storekit_objc}/FIATransactionCache.h | 0 .../FLTMethodChannelProtocol.h | 0 .../FLTPaymentQueueHandlerProtocol.h | 0 .../FLTPaymentQueueProtocol.h | 0 .../FLTRequestHandlerProtocol.h | 0 .../FLTTransactionCacheProtocol.h | 0 .../in_app_purchase_storekit.h | 0 .../include/in_app_purchase_storekit_objc}/messages.g.h | 0 .../messages.g.m | 2 +- .../example/shared/RunnerTests/Stubs.h | 2 +- .../in_app_purchase_storekit/pigeons/messages.dart | 6 +++--- 29 files changed, 28 insertions(+), 29 deletions(-) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/FIAObjectTranslator.m (99%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/FIAPPaymentQueueDelegate.m (95%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/FIAPReceiptManager.m (92%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/FIAPRequestHandler.m (95%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/FIAPaymentQueueHandler.m (97%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/FIATransactionCache.m (92%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/Protocols/FLTMethodChannelProtocol.m (91%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/Protocols/FLTPaymentQueueProtocol.m (96%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/Protocols/FLTRequestHandlerProtocol.m (82%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/Protocols/FLTTransactionCacheProtocol.m (90%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FIAObjectTranslator.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FIAPPaymentQueueDelegate.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FIAPReceiptManager.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FIAPRequestHandler.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FIAPaymentQueueHandler.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FIATransactionCache.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FLTMethodChannelProtocol.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FLTPaymentQueueHandlerProtocol.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FLTPaymentQueueProtocol.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FLTRequestHandlerProtocol.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/FLTTransactionCacheProtocol.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/in_app_purchase_storekit.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc/include/storekit_objc => in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc}/messages.g.h (100%) rename packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/{storekit_objc => in_app_purchase_storekit_objc}/messages.g.m (99%) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec index 239e543ff8f..4170a556d62 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit.podspec @@ -18,7 +18,7 @@ Downloaded by pub (not CocoaPods). s.documentation_url = 'https://pub.dev/packages/in_app_purchase' s.swift_version = '5.0' s.source_files = 'in_app_purchase_storekit/Sources/**/*.{h,m,swift}' - s.public_header_files = 'in_app_purchase_storekit/Sources/storekit_objc/include/**/*.h' + s.public_header_files = 'in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/**/*.h' s.ios.dependency 'Flutter' s.osx.dependency 'FlutterMacOS' diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift index 5041bf8547a..edca47a9ed7 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Package.swift @@ -21,18 +21,18 @@ let package = Package( .target( name: "in_app_purchase_storekit", dependencies: [ - "storekit_objc" + "in_app_purchase_storekit_objc" ], resources: [ .process("Resources/PrivacyInfo.xcprivacy") ] ), .target( - name: "storekit_objc", + name: "in_app_purchase_storekit_objc", dependencies: [], - publicHeadersPath: "include/storekit_objc", + publicHeadersPath: "include/in_app_purchase_storekit_objc", cSettings: [ - .headerSearchPath("include/storekit_objc") + .headerSearchPath("include/in_app_purchase_storekit_objc") ] ), ] diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift index 830acf141f0..994dd01783c 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/InAppPurchasePlugin.swift @@ -5,8 +5,8 @@ import Foundation import StoreKit -#if canImport(storekit_objc) - import storekit_objc +#if canImport(in_app_purchase_storekit_objc) + import in_app_purchase_storekit_objc #endif #if os(iOS) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAObjectTranslator.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAObjectTranslator.m similarity index 99% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAObjectTranslator.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAObjectTranslator.m index 14ea497d8e0..1323dfaf366 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAObjectTranslator.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAObjectTranslator.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "./include/storekit_objc/FIAObjectTranslator.h" +#import "./include/in_app_purchase_storekit_objc/FIAObjectTranslator.h" #pragma mark - SKProduct Coders diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPPaymentQueueDelegate.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.m similarity index 95% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPPaymentQueueDelegate.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.m index 1c54fd457a3..c0c1b671d70 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPPaymentQueueDelegate.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "./include/storekit_objc/FIAPPaymentQueueDelegate.h" -#import "./include/storekit_objc/FIAObjectTranslator.h" +#import "./include/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.h" +#import "./include/in_app_purchase_storekit_objc/FIAObjectTranslator.h" @interface FIAPPaymentQueueDelegate () diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPReceiptManager.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPReceiptManager.m similarity index 92% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPReceiptManager.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPReceiptManager.m index d49f3ac725e..ffb555a7928 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPReceiptManager.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPReceiptManager.m @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "./include/storekit_objc/FIAPReceiptManager.h" +#import "./include/in_app_purchase_storekit_objc/FIAPReceiptManager.h" +#import "./include/in_app_purchase_storekit_objc/FIAObjectTranslator.h" + #if TARGET_OS_OSX #import #else #import #endif -#import "./include/storekit_objc/FIAObjectTranslator.h" @interface FIAPReceiptManager () // Gets the receipt file data from the location of the url. Can be nil if diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPRequestHandler.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPRequestHandler.m similarity index 95% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPRequestHandler.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPRequestHandler.m index 4dd1df5924b..81548cba0c0 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPRequestHandler.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPRequestHandler.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "./include/storekit_objc/FIAPRequestHandler.h" +#import "./include/in_app_purchase_storekit_objc/FIAPRequestHandler.h" #import #pragma mark - Main Handler diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPaymentQueueHandler.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPaymentQueueHandler.m similarity index 97% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPaymentQueueHandler.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPaymentQueueHandler.m index 3ca5584b2bf..570a74dd2e9 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIAPaymentQueueHandler.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPaymentQueueHandler.m @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "./include/storekit_objc/FIAPaymentQueueHandler.h" -#import "./include/storekit_objc/FIAPPaymentQueueDelegate.h" -#import "./include/storekit_objc/FIATransactionCache.h" +#import "./include/in_app_purchase_storekit_objc/FIAPaymentQueueHandler.h" +#import "./include/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.h" +#import "./include/in_app_purchase_storekit_objc/FIATransactionCache.h" @interface FIAPaymentQueueHandler () diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIATransactionCache.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIATransactionCache.m similarity index 92% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIATransactionCache.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIATransactionCache.m index 22850ec68d3..21cbd59da14 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/FIATransactionCache.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIATransactionCache.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "./include/storekit_objc/FIATransactionCache.h" +#import "./include/in_app_purchase_storekit_objc/FIATransactionCache.h" @interface FIATransactionCache () diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTMethodChannelProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTMethodChannelProtocol.m similarity index 91% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTMethodChannelProtocol.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTMethodChannelProtocol.m index a07ea074ac7..debab6c6e75 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTMethodChannelProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTMethodChannelProtocol.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include +#import "../include/in_app_purchase_storekit_objc/FLTMethodChannelProtocol.h" #if TARGET_OS_OSX #import @@ -10,8 +10,6 @@ #import #endif -#import "../include/storekit_objc/FLTMethodChannelProtocol.h" - @interface DefaultMethodChannel () /// The wrapped FlutterMethodChannel @property(nonatomic, strong) FlutterMethodChannel *channel; diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTPaymentQueueProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTPaymentQueueProtocol.m similarity index 96% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTPaymentQueueProtocol.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTPaymentQueueProtocol.m index bc53e781450..812c5a9dac7 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTPaymentQueueProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTPaymentQueueProtocol.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "../include/storekit_objc/FLTPaymentQueueProtocol.h" +#import "../include/in_app_purchase_storekit_objc/FLTPaymentQueueProtocol.h" @interface DefaultPaymentQueue () /// The wrapped SKPaymentQueue diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTRequestHandlerProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTRequestHandlerProtocol.m similarity index 82% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTRequestHandlerProtocol.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTRequestHandlerProtocol.m index f7ad0c62f50..f5a5f4beaa7 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTRequestHandlerProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTRequestHandlerProtocol.m @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "../include/storekit_objc/FLTRequestHandlerProtocol.h" +#import "../include/in_app_purchase_storekit_objc/FLTRequestHandlerProtocol.h" #import -#import "../include/storekit_objc/FIAPRequestHandler.h" +#import "../include/in_app_purchase_storekit_objc/FIAPRequestHandler.h" @interface DefaultRequestHandler () /// The wrapped FIAPRequestHandler diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTTransactionCacheProtocol.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTTransactionCacheProtocol.m similarity index 90% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTTransactionCacheProtocol.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTTransactionCacheProtocol.m index 998ceca17ba..592c8afbb68 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/Protocols/FLTTransactionCacheProtocol.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/Protocols/FLTTransactionCacheProtocol.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "../include/storekit_objc/FLTTransactionCacheProtocol.h" +#import "../include/in_app_purchase_storekit_objc/FLTTransactionCacheProtocol.h" @interface DefaultTransactionCache () /// The wrapped FIATransactionCache diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAObjectTranslator.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAObjectTranslator.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAObjectTranslator.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAObjectTranslator.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPPaymentQueueDelegate.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPPaymentQueueDelegate.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPReceiptManager.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPReceiptManager.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPReceiptManager.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPReceiptManager.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPRequestHandler.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPRequestHandler.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPRequestHandler.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPaymentQueueHandler.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPaymentQueueHandler.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIAPaymentQueueHandler.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPaymentQueueHandler.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIATransactionCache.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIATransactionCache.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FIATransactionCache.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIATransactionCache.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTMethodChannelProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTMethodChannelProtocol.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTMethodChannelProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTMethodChannelProtocol.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueHandlerProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTPaymentQueueHandlerProtocol.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueHandlerProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTPaymentQueueHandlerProtocol.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTPaymentQueueProtocol.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTPaymentQueueProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTPaymentQueueProtocol.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTRequestHandlerProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTRequestHandlerProtocol.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTRequestHandlerProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTRequestHandlerProtocol.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTTransactionCacheProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTTransactionCacheProtocol.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/FLTTransactionCacheProtocol.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTTransactionCacheProtocol.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/in_app_purchase_storekit.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/in_app_purchase_storekit.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/in_app_purchase_storekit.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/in_app_purchase_storekit.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/messages.g.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/messages.g.h similarity index 100% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/messages.g.h rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/messages.g.h diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/messages.g.m similarity index 99% rename from packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m rename to packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/messages.g.m index 23d582e57c6..838c9a6fe49 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/messages.g.m @@ -4,7 +4,7 @@ // Autogenerated from Pigeon (v22.7.3), do not edit directly. // See also: https://pub.dev/packages/pigeon -#import "./include/storekit_objc/messages.g.h" +#import "./include/in_app_purchase_storekit_objc/messages.g.h" #if TARGET_OS_OSX #import diff --git a/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h b/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h index cd631959ec6..456986cbab0 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.h @@ -14,7 +14,7 @@ #if __has_include() @import in_app_purchase_storekit; #else -@import storekit_objc; +@import in_app_purchase_storekit_objc; #endif NS_ASSUME_NONNULL_BEGIN diff --git a/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart b/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart index ebc4f4b014d..5fc6cc57ebe 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart +++ b/packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart @@ -8,12 +8,12 @@ import 'package:pigeon/pigeon.dart'; dartOut: 'lib/src/messages.g.dart', dartTestOut: 'test/test_api.g.dart', objcHeaderOut: - 'darwin/in_app_purchase_storekit/Sources/storekit_objc/include/storekit_objc/messages.g.h', + 'darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/messages.g.h', objcSourceOut: - 'darwin/in_app_purchase_storekit/Sources/storekit_objc/messages.g.m', + 'darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/messages.g.m', objcOptions: ObjcOptions( prefix: 'FIA', - headerIncludePath: './include/storekit_objc/messages.g.h', + headerIncludePath: './include/in_app_purchase_storekit_objc/messages.g.h', ), copyrightHeader: 'pigeons/copyright.txt', )) From 1598e95ec07f6660d748e9980eb64cfbaf93727a Mon Sep 17 00:00:00 2001 From: alejandro-all-win-software Date: Fri, 24 Jan 2025 16:52:57 -0600 Subject: [PATCH 08/10] feedback --- .../Sources/in_app_purchase_storekit_objc/FIAPReceiptManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPReceiptManager.m b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPReceiptManager.m index ffb555a7928..b579278cee9 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPReceiptManager.m +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/FIAPReceiptManager.m @@ -3,13 +3,13 @@ // found in the LICENSE file. #import "./include/in_app_purchase_storekit_objc/FIAPReceiptManager.h" -#import "./include/in_app_purchase_storekit_objc/FIAObjectTranslator.h" #if TARGET_OS_OSX #import #else #import #endif +#import "./include/in_app_purchase_storekit_objc/FIAObjectTranslator.h" @interface FIAPReceiptManager () // Gets the receipt file data from the location of the url. Can be nil if From 98fc8cff3b5ffba5a315338dab2131112dd6df84 Mon Sep 17 00:00:00 2001 From: alejandro-all-win-software Date: Fri, 24 Jan 2025 17:25:23 -0600 Subject: [PATCH 09/10] feedback --- .../in_app_purchase_storekit_objc/FIAPReceiptManager.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPReceiptManager.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPReceiptManager.h index b04bc98a2ba..94020ff2348 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPReceiptManager.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPReceiptManager.h @@ -2,13 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include - -#if TARGET_OS_OSX -#import -#else -#import -#endif #import NS_ASSUME_NONNULL_BEGIN From c6fbc725df5c018725ae127361751f36151af8ce Mon Sep 17 00:00:00 2001 From: alejandro-all-win-software Date: Mon, 27 Jan 2025 13:08:36 -0600 Subject: [PATCH 10/10] feedback --- .../in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.h | 3 +-- .../in_app_purchase_storekit_objc/FLTMethodChannelProtocol.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.h index 2a99de17906..ba29ead104e 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FIAPPaymentQueueDelegate.h @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include +#import #if TARGET_OS_OSX #import #else #import #endif -#import #import #import "FLTMethodChannelProtocol.h" diff --git a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTMethodChannelProtocol.h b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTMethodChannelProtocol.h index b5a15f818a4..283c06704d5 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTMethodChannelProtocol.h +++ b/packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit_objc/include/in_app_purchase_storekit_objc/FLTMethodChannelProtocol.h @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include +#import #if TARGET_OS_OSX #import #else #import #endif -#import NS_ASSUME_NONNULL_BEGIN /// A protocol that wraps FlutterMethodChannel.