Browse Source

Merge pull request #645 from fnuky/master

Fix watch build on xcode 12.5
Sam Spencer 4 years ago
parent
commit
b1ae9596b5

+ 1 - 1
Sources/SwiftyStoreKit/InAppProductQueryRequest.swift

@@ -26,7 +26,7 @@ import StoreKit
 
 
 typealias InAppProductRequestCallback = (RetrieveResults) -> Void
 typealias InAppProductRequestCallback = (RetrieveResults) -> Void
 
 
-public protocol InAppRequest: class {
+public protocol InAppRequest: AnyObject {
     func start()
     func start()
     func cancel()
     func cancel()
 }
 }

+ 3 - 3
Sources/SwiftyStoreKit/PaymentQueueController.swift

@@ -41,7 +41,7 @@ public enum TransactionResult {
     case failed(error: SKError)
     case failed(error: SKError)
 }
 }
 
 
-public protocol PaymentQueue: class {
+public protocol PaymentQueue: AnyObject {
     
     
     func add(_ observer: SKPaymentTransactionObserver)
     func add(_ observer: SKPaymentTransactionObserver)
     func remove(_ observer: SKPaymentTransactionObserver)
     func remove(_ observer: SKPaymentTransactionObserver)
@@ -273,9 +273,9 @@ class PaymentQueueController: NSObject, SKPaymentTransactionObserver {
         updatedDownloadsHandler?(downloads)
         updatedDownloadsHandler?(downloads)
     }
     }
     
     
-    // #if os(iOS) && !targetEnvironment(macCatalyst)
+    #if !os(watchOS)
     func paymentQueue(_ queue: SKPaymentQueue, shouldAddStorePayment payment: SKPayment, for product: SKProduct) -> Bool {
     func paymentQueue(_ queue: SKPaymentQueue, shouldAddStorePayment payment: SKPayment, for product: SKProduct) -> Bool {
         return shouldAddStorePaymentHandler?(payment, product) ?? false
         return shouldAddStorePaymentHandler?(payment, product) ?? false
     }
     }
-    // #endif
+    #endif
 }
 }

+ 1 - 1
Sources/SwiftyStoreKit/ProductsInfoController.swift

@@ -25,7 +25,7 @@
 import Foundation
 import Foundation
 import StoreKit
 import StoreKit
 
 
-protocol InAppProductRequestBuilder: class {
+protocol InAppProductRequestBuilder: AnyObject {
     func request(productIds: Set<String>, callback: @escaping InAppProductRequestCallback) -> InAppProductRequest
     func request(productIds: Set<String>, callback: @escaping InAppProductRequestCallback) -> InAppProductRequest
 }
 }