Browse Source

Updated for XCode 8.0 Beta-4

David Wong 9 years ago
parent
commit
c4bdba0059

+ 2 - 2
SwiftyStoreDemo/NetworkActivityIndicatorManager.swift

@@ -31,7 +31,7 @@ class NetworkActivityIndicatorManager: NSObject {
     class func networkOperationStarted() {
         
         if loadingCount == 0 {
-            UIApplication.shared().isNetworkActivityIndicatorVisible = true
+            UIApplication.shared.isNetworkActivityIndicatorVisible = true
         }
         loadingCount += 1
     }
@@ -41,7 +41,7 @@ class NetworkActivityIndicatorManager: NSObject {
             loadingCount -= 1
         }
         if loadingCount == 0 {
-            UIApplication.shared().isNetworkActivityIndicatorVisible = false
+            UIApplication.shared.isNetworkActivityIndicatorVisible = false
         }
     }
 }

+ 1 - 1
SwiftyStoreDemo/ViewController.swift

@@ -154,7 +154,7 @@ class ViewController: UIViewController {
         }
     }
 
-    override func preferredStatusBarStyle() -> UIStatusBarStyle {
+    override var preferredStatusBarStyle: UIStatusBarStyle {
         return .lightContent
     }
 }

+ 6 - 0
SwiftyStoreKit.xcodeproj/project.pbxproj

@@ -384,7 +384,9 @@
 					};
 					6502F5FD1B985833004E342D = {
 						CreatedOnToolsVersion = 7.0;
+						DevelopmentTeam = U3DJQK3H6X;
 						LastSwiftMigration = 0800;
+						ProvisioningStyle = Automatic;
 					};
 					6502F62C1B985C40004E342D = {
 						CreatedOnToolsVersion = 7.0;
@@ -706,6 +708,8 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEVELOPMENT_TEAM = U3DJQK3H6X;
 				INFOPLIST_FILE = SwiftyStoreDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -721,6 +725,8 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEVELOPMENT_TEAM = U3DJQK3H6X;
 				INFOPLIST_FILE = SwiftyStoreDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

+ 5 - 5
SwiftyStoreKit/InAppCompleteTransactionsObserver.swift

@@ -29,11 +29,11 @@ extension SKPaymentTransactionState {
     
     var stringValue: String {
         switch self {
-        case purchasing: return "Purchasing"
-        case purchased: return "Purchased"
-        case failed: return "Failed"
-        case restored: return "Restored"
-        case deferred: return "Deferred"
+        case .purchasing: return "Purchasing"
+        case .purchased: return "Purchased"
+        case .failed: return "Failed"
+        case .restored: return "Restored"
+        case .deferred: return "Deferred"
         }
     }
 }

+ 4 - 3
SwiftyStoreKit/InAppProductPurchaseRequest.swift

@@ -75,13 +75,14 @@ class InAppProductPurchaseRequest: NSObject, SKPaymentTransactionObserver {
         }
         let payment = SKMutablePayment(product: product)
         payment.applicationUsername = applicationUsername
-        DispatchQueue.global(attributes: DispatchQueue.GlobalAttributes.qosDefault).async {
+        
+        DispatchQueue.global(qos: .default).async {
             self.paymentQueue.add(payment)
         }
     }
     private func startRestorePurchases() {
         
-        DispatchQueue.global(attributes: DispatchQueue.GlobalAttributes.qosDefault).async {
+        DispatchQueue.global(qos: .default).async {
             self.paymentQueue.restoreCompletedTransactions()
         }
     }
@@ -149,7 +150,7 @@ class InAppProductPurchaseRequest: NSObject, SKPaymentTransactionObserver {
         
     }
     
-    func paymentQueue(_ queue: SKPaymentQueue, restoreCompletedTransactionsFailedWithError error: NSError) {
+    func paymentQueue(_ queue: SKPaymentQueue, restoreCompletedTransactionsFailedWithError error: Error) {
         
         DispatchQueue.main.async {
             self.callback(results: [.failed(error: error)])

+ 3 - 3
SwiftyStoreKit/InAppProductQueryRequest.swift

@@ -48,12 +48,12 @@ class InAppProductQueryRequest: NSObject, SKProductsRequestDelegate {
     }
 
     func start() {
-        DispatchQueue.global(attributes: DispatchQueue.GlobalAttributes.qosDefault).async {
+        DispatchQueue.global(qos: .default).async {
             self.request.start()
         }
     }
     func cancel() {
-        DispatchQueue.global(attributes: DispatchQueue.GlobalAttributes.qosDefault).async {
+        DispatchQueue.global(qos: .default).async {
             self.request.cancel()
         }
     }
@@ -74,7 +74,7 @@ class InAppProductQueryRequest: NSObject, SKProductsRequestDelegate {
         
     }
 
-    func request(_ request: SKRequest, didFailWithError error: NSError) {
+    func request(_ request: SKRequest, didFailWithError error: Error) {
         requestFailed(error)
     }
 

+ 3 - 3
SwiftyStoreKit/InAppReceipt.swift

@@ -50,15 +50,15 @@ extension SwiftyStoreKit {
 }
 
 // Error when managing receipt
-public enum ReceiptError: ErrorProtocol {
+public enum ReceiptError: Swift.Error {
     // No receipt data
     case noReceiptData
     // No data receice
     case noRemoteData
     // Error when encoding HTTP body into JSON
-    case requestBodyEncodeError(error: ErrorProtocol)
+    case requestBodyEncodeError(error: Swift.Error)
     // Error when proceeding request
-    case networkError(error: ErrorProtocol)
+    case networkError(error: Swift.Error)
     // Error when decoding response
     case jsonDecodeError(string: String?)
     // Receive invalid - bad status returned

+ 1 - 1
SwiftyStoreKit/InAppReceiptRefreshRequest.swift

@@ -69,7 +69,7 @@ import Foundation
             }*/
             callback(result: .success)
         }
-        func request(_ request: SKRequest, didFailWithError error: NSError) {
+        func request(_ request: SKRequest, didFailWithError error: Error) {
             // XXX could here check domain and error code to return typed exception
             callback(result: .error(e: error))
         }

+ 3 - 3
SwiftyStoreKit/SwiftyStoreKit.swift

@@ -74,11 +74,11 @@ public class SwiftyStoreKit {
     }
     public struct RestoreResults {
         public let restoredProductIds: [String]
-        public let restoreFailedProducts: [(ErrorProtocol, String?)]
+        public let restoreFailedProducts: [(Swift.Error, String?)]
     }
     public enum RefreshReceiptResult {
         case success
-        case error(error: ErrorProtocol)
+        case error(error: Swift.Error)
     }
     public struct CompletedTransaction {
         public let productId: String
@@ -261,7 +261,7 @@ public class SwiftyStoreKit {
     
     private func processRestoreResults(_ results: [InAppProductPurchaseRequest.TransactionResult]) -> RestoreResults {
         var restoredProductIds: [String] = []
-        var restoreFailedProducts: [(ErrorProtocol, String?)] = []
+        var restoreFailedProducts: [(Swift.Error, String?)] = []
         for result in results {
             switch result {
             case .purchased(let productId):