Merge pull request #15 from garnett/swifty-changes

Swifty syntax changes

SwiftyStoreKit/InAppProductPurchaseRequest.swift

@@ -40,9 +40,7 @@ class InAppProductPurchaseRequest: NSObject, SKPaymentTransactionObserver {
     private var purchases : [PaymentTransactionState: [String]] = [:]
 
     var paymentQueue: SKPaymentQueue {
-        get {
-            return  SKPaymentQueue.defaultQueue()
-        }
+        return SKPaymentQueue.defaultQueue()
     }
     
     let product : SKProduct?
@@ -76,15 +74,15 @@ class InAppProductPurchaseRequest: NSObject, SKPaymentTransactionObserver {
             return
         }
         let payment = SKMutablePayment(product: product)
-        dispatch_async(dispatch_get_global_queue(0, 0), {
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)) {
             self.paymentQueue.addPayment(payment)
-        })
+        }
     }
     private func startRestorePurchases() {
         
-        dispatch_async(dispatch_get_global_queue(0, 0), {
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)) {
             self.paymentQueue.restoreCompletedTransactions()
-        })
+        }
     }
     
     // MARK: SKPaymentTransactionObserver
@@ -100,22 +98,22 @@ class InAppProductPurchaseRequest: NSObject, SKPaymentTransactionObserver {
 
             switch transactionState {
             case .Purchased:
-                dispatch_async(dispatch_get_main_queue(), {
+                dispatch_async(dispatch_get_main_queue()) {
                     self.callback(result: .Purchased(productId: transaction.payment.productIdentifier))
-                })
+                }
                 paymentQueue.finishTransaction(transaction)
             case .Failed:
-                dispatch_async(dispatch_get_main_queue(), {
+                dispatch_async(dispatch_get_main_queue()) {
                     // It appears that in some edge cases transaction.error is nil here. Since returning an associated error is
                     // mandatory, return a default one if needed
                     let altError = NSError(domain: SKErrorDomain, code: 0, userInfo: [ NSLocalizedDescriptionKey: "Unknown error" ])
                     self.callback(result: .Failed(error: transaction.error ?? altError))
-                })
+                }
                 paymentQueue.finishTransaction(transaction)
             case .Restored:
-                dispatch_async(dispatch_get_main_queue(), {
+                dispatch_async(dispatch_get_main_queue()) {
                     self.callback(result: .Restored(productId: transaction.payment.productIdentifier))
-                })
+                }
                 paymentQueue.finishTransaction(transaction)
             case .Purchasing:
                 // In progress: do nothing
@@ -139,9 +137,9 @@ class InAppProductPurchaseRequest: NSObject, SKPaymentTransactionObserver {
     
     func paymentQueue(queue: SKPaymentQueue, restoreCompletedTransactionsFailedWithError error: NSError) {
         
-        dispatch_async(dispatch_get_main_queue(), {
+        dispatch_async(dispatch_get_main_queue()) {
             self.callback(result: .Failed(error: error))
-        })
+        }
     }
 
     func paymentQueueRestoreCompletedTransactionsFinished(queue: SKPaymentQueue) {

SwiftyStoreKit/InAppProductQueryRequest.swift

@@ -58,14 +58,14 @@ class InAppProductQueryRequest: NSObject, SKProductsRequestDelegate {
     }
 
     func start() {
-        dispatch_async(dispatch_get_global_queue(0, 0), {
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)) {
             self.request.start()
-        })
+        }
     }
     func cancel() {
-        dispatch_async(dispatch_get_global_queue(0, 0), {
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)) {
             self.request.cancel()
-        })
+        }
     }
     
     // MARK: SKProductsRequestDelegate
@@ -73,16 +73,16 @@ class InAppProductQueryRequest: NSObject, SKProductsRequestDelegate {
         
         if let invalidProductIdentifiers = response._invalidProductIdentifiers where invalidProductIdentifiers.count > 0 {
             let error = ResponseError.InvalidProducts(invalidProductIdentifiers: invalidProductIdentifiers)
-            dispatch_async(dispatch_get_main_queue(), {
+            dispatch_async(dispatch_get_main_queue()) {
                 self.callback(result: .Error(e: error))
-            })
+            }
             return
         }
         guard let products = response._products where products.count > 0 else {
             let error = ResponseError.NoProducts
-            dispatch_async(dispatch_get_main_queue(), {
+            dispatch_async(dispatch_get_main_queue()) {
                 self.callback(result: .Error(e: error))
-            })
+            }
             return
         }
         callback(result: .Success(products: products))
@@ -98,7 +98,7 @@ class InAppProductQueryRequest: NSObject, SKProductsRequestDelegate {
     }
     #elseif os(OSX)
     func request(request: SKRequest, didFailWithError error: NSError?) {
-        if let notNilError = error{
+        if let notNilError = error {
             requestFailed(notNilError)
         }
         else {
@@ -108,8 +108,8 @@ class InAppProductQueryRequest: NSObject, SKProductsRequestDelegate {
     #endif
     func requestFailed(error: NSError){
         let error = ResponseError.RequestFailed(error: error)
-        dispatch_async(dispatch_get_main_queue(), {
+        dispatch_async(dispatch_get_main_queue()) {
             self.callback(result: .Error(e: error))
-        })
+        }
     }
 }