remove uneeded filed

packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/InAppPurchaseStoreKit2PluginTests.swift

@@ -47,7 +47,6 @@ final class InAppPurchase2PluginTests: XCTestCase {
         fetchedProductMsg = productMessages.first
         expectation.fulfill()
       case .failure(let error):
-        // Handle the error
         print("Failed to fetch products: \(error.localizedDescription)")
       }
     }
@@ -70,9 +69,7 @@ final class InAppPurchase2PluginTests: XCTestCase {
       case .success(let productMessages):
         fetchedProductMsg = productMessages.first
         expectation.fulfill()
-      case .failure(let error):
-        // Handle the error
-        print("Failed to fetch products: \(error.localizedDescription)")
+      case .failure(let error): print("Failed to fetch products: \(error.localizedDescription)")
       }
     }
     await fulfillment(of: [expectation], timeout: 5)
@@ -104,7 +101,7 @@ final class InAppPurchase2PluginTests: XCTestCase {
   }
 
   //TODO(louisehsu): Add testing for lower versions.
-  @available(iOS 17.0, *)
+  @available(iOS 17.0, macOS 14.0, *)
   func testGetProductsWithStoreKitError() async throws {
     try await session.setSimulatedError(
       .generic(.networkError(URLError(.badURL))), forAPI: .loadProducts)
@@ -128,9 +125,7 @@ final class InAppPurchase2PluginTests: XCTestCase {
 
   func testSuccessfulPurchase() async throws {
     let expectation = self.expectation(description: "Purchase request should succeed")
-    plugin.purchase(
-      id: "consumable", options: nil
-    ) { result in
+    plugin.purchase(id: "consumable", options: nil) { result in
       switch result {
       case .success(let purchaseResult):
         expectation.fulfill()
@@ -141,14 +136,12 @@ final class InAppPurchase2PluginTests: XCTestCase {
     await fulfillment(of: [expectation], timeout: 5)
   }
 
-  @available(iOS 17.0, *)
+  @available(iOS 17.0, macOS 14.0, *)
   func testFailedNetworkErrorPurchase() async throws {
     try await session.setSimulatedError(
       .generic(.networkError(URLError(.badURL))), forAPI: .loadProducts)
     let expectation = self.expectation(description: "products request should fail")
-    plugin.purchase(
-      id: "consumable", options: nil
-    ) { result in
+    plugin.purchase(id: "consumable", options: nil) { result in
       switch result {
       case .success(_):
         XCTFail("Purchase should NOT suceed.")
@@ -162,14 +155,12 @@ final class InAppPurchase2PluginTests: XCTestCase {
     await fulfillment(of: [expectation], timeout: 5)
   }
 
-  @available(iOS 17.0, *)
+  @available(iOS 17.0, macOS 14.0, *)
   func testFailedProductUnavilablePurchase() async throws {
     try await session.setSimulatedError(
       .purchase(.productUnavailable), forAPI: .purchase)
     let expectation = self.expectation(description: "Purchase request should succeed")
-    plugin.purchase(
-      id: "consumable", options: nil
-    ) { result in
+    plugin.purchase(id: "consumable", options: nil) { result in
       switch result {
       case .success(_):
         XCTFail("Purchase should NOT suceed.")
@@ -183,9 +174,7 @@ final class InAppPurchase2PluginTests: XCTestCase {
 
   func testInvalidProductPurchase() async throws {
     let expectation = self.expectation(description: "products request should fail")
-    plugin.purchase(
-      id: "invalid_product", options: nil
-    ) { result in
+    plugin.purchase(id: "invalid_product", options: nil) { result in
       switch result {
       case .success(_):
         XCTFail("Purchase should NOT suceed.")
@@ -201,9 +190,7 @@ final class InAppPurchase2PluginTests: XCTestCase {
 
   func testPurchaseUpgradeConsumableSuccess() async throws {
     let expectation = self.expectation(description: "Purchase request should succeed")
-    plugin.purchase(
-      id: "subscription_discounted", options: nil
-    ) { result in
+    plugin.purchase(id: "subscription_discounted", options: nil) { result in
       switch result {
       case .success(let purchaseResult):
         expectation.fulfill()
@@ -216,9 +203,7 @@ final class InAppPurchase2PluginTests: XCTestCase {
 
   func testDiscountedSubscriptionSuccess() async throws {
     let expectation = self.expectation(description: "Purchase request should succeed")
-    plugin.purchase(
-      id: "subscription_discounted", options: nil
-    ) { result in
+    plugin.purchase(id: "subscription_discounted", options: nil) { result in
       switch result {
       case .success(let purchaseResult):
         expectation.fulfill()
@@ -231,9 +216,7 @@ final class InAppPurchase2PluginTests: XCTestCase {
 
   func testDiscountedProductSuccess() async throws {
     let expectation = self.expectation(description: "Purchase request should succeed")
-    plugin.purchase(
-      id: "consumable_discounted", options: nil
-    ) { result in
+    plugin.purchase(id: "consumable_discounted", options: nil) { result in
       switch result {
       case .success(let purchaseResult):
         expectation.fulfill()

packages/in_app_purchase/in_app_purchase_storekit/lib/src/in_app_purchase_storekit_platform.dart

@@ -35,23 +35,23 @@ class InAppPurchaseStoreKitPlatform extends InAppPurchasePlatform {
 
   /// StoreKit1
   static late SKPaymentQueueWrapper _skPaymentQueueWrapper;
-  static late _TransactionObserver _observer;
+  static late _TransactionObserver _sk1transactionObserver;
 
   /// StoreKit2
-  static late SK2TransactionObserver _sk2transactionObserver;
+  static late SK2TransactionObserverWrapper _sk2transactionObserver;
 
   @override
   Stream<List<PurchaseDetails>> get purchaseStream => _useStoreKit2
       ? _sk2transactionObserver.transactionsCreatedController.stream
-      : _observer.purchaseUpdatedController.stream;
+      : _sk1transactionObserver.purchaseUpdatedController.stream;
 
   /// Callback handler for transaction status changes.
   @visibleForTesting
-  static SKTransactionObserverWrapper get observer => _observer;
+  static SKTransactionObserverWrapper get observer => _sk1transactionObserver;
 
   /// Callback handler for transaction status changes for StoreKit2 transactions
   @visibleForTesting
-  static SK2TransactionObserver get sk2transactionObserver =>
+  static SK2TransactionObserverWrapper get sk2transactionObserver =>
       _sk2transactionObserver;
 
   /// Registers this class as the default instance of [InAppPurchasePlatform].
@@ -73,7 +73,7 @@ class InAppPurchaseStoreKitPlatform extends InAppPurchasePlatform {
         onListen: () => SK2Transaction.startListeningToTransactions(),
         onCancel: () => SK2Transaction.stopListeningToTransactions(),
       );
-      _sk2transactionObserver = SK2TransactionObserver(
+      _sk2transactionObserver = SK2TransactionObserverWrapper(
           transactionsCreatedController: updateController2);
       InAppPurchase2CallbackAPI.setUp(_sk2transactionObserver);
     } else {
@@ -84,7 +84,7 @@ class InAppPurchaseStoreKitPlatform extends InAppPurchasePlatform {
         onListen: () => _skPaymentQueueWrapper.startObservingTransactionQueue(),
         onCancel: () => _skPaymentQueueWrapper.stopObservingTransactionQueue(),
       );
-      _observer = _TransactionObserver(updateController);
+      _sk1transactionObserver = _TransactionObserver(updateController);
       _skPaymentQueueWrapper.setTransactionObserver(observer);
     }
   }
@@ -149,11 +149,12 @@ class InAppPurchaseStoreKitPlatform extends InAppPurchasePlatform {
 
   @override
   Future<void> restorePurchases({String? applicationUserName}) async {
-    return _observer
+    return _sk1transactionObserver
         .restoreTransactions(
             queue: _skPaymentQueueWrapper,
             applicationUserName: applicationUserName)
-        .whenComplete(() => _observer.cleanUpRestoredTransactions());
+        .whenComplete(
+            () => _sk1transactionObserver.cleanUpRestoredTransactions());
   }
 
   /// Query the product detail list.

packages/in_app_purchase/in_app_purchase_storekit/lib/src/store_kit_2_wrappers/sk2_transaction_wrapper.dart

@@ -121,9 +121,9 @@ extension on SK2TransactionMessage {
 }
 
 /// An observer that listens to all transactions created
-class SK2TransactionObserver implements InAppPurchase2CallbackAPI {
-  /// Creates a new instance of [SK2TransactionObserver]
-  SK2TransactionObserver({required this.transactionsCreatedController});
+class SK2TransactionObserverWrapper implements InAppPurchase2CallbackAPI {
+  /// Creates a new instance of [SK2TransactionObserverWrapper]
+  SK2TransactionObserverWrapper({required this.transactionsCreatedController});
 
   /// The transactions stream to listen to
   final StreamController<List<PurchaseDetails>> transactionsCreatedController;