Further Swift 1.2 fixes

These fixes were required in-between beta 3 and 6.3 GM.

Author: mxcl

Swift Sources/NSJSONFromData.swift

@@ -24,7 +24,7 @@ func NSJSONFromDataT<T>(data: NSData) -> Promise<T> {
     } else if let cast = json as? T {
         return Promise(value: cast)
     } else {
-        var info = NSMutableDictionary()
+        var info: [NSObject: AnyObject] = [:]
         info[NSLocalizedDescriptionKey] = "The server returned JSON in an unexpected arrangement"
         if let jo:AnyObject = json { info[PMKJSONErrorJSONObjectKey] = jo }
         let error = NSError(domain:PMKErrorDomain, code:PMKJSONError, userInfo:info)

Swift Sources/NSURLConnection+Promise.swift

@@ -31,7 +31,7 @@ private func fetch<T>(var request: NSURLRequest, body: ((T) -> Void, (NSError) -
             //TODO in the event of a non 2xx rsp, try to parse JSON out of the response anyway
 
             func rejecter(error: NSError) {
-                let info = NSMutableDictionary(dictionary: error.userInfo ?? [:])
+                var info: [NSObject: AnyObject] = error.userInfo ?? [:]
                 info[NSURLErrorFailingURLErrorKey] = request.URL
                 info[NSURLErrorFailingURLStringErrorKey] = request.URL!.absoluteString
                 if data != nil {
@@ -52,21 +52,15 @@ private func fetch<T>(var request: NSURLRequest, body: ((T) -> Void, (NSError) -
             if err != nil {
                 rejecter(err)
             } else {
-                if let response = (rsp as? NSHTTPURLResponse) {
-                    if response.statusCode < 200 || response.statusCode >= 300 {
-                        rejecter(NSError(domain: NSURLErrorDomain,
-                                         code: NSURLErrorBadServerResponse,
-                                         userInfo: [
-                                             NSLocalizedDescriptionKey: "The server returned a bad HTTP response code",
-                                             NSURLErrorFailingURLStringErrorKey: request.URL.absoluteString!,
-                                             NSURLErrorFailingURLErrorKey: request.URL
-                                         ]))
-
-                        return
-                    }
+                if let response = (rsp as? NSHTTPURLResponse) where response.statusCode < 200 || response.statusCode >= 300 {
+                    rejecter(NSError(domain: NSURLErrorDomain,
+                                     code: NSURLErrorBadServerResponse,
+                                     userInfo: [
+                                         NSLocalizedDescriptionKey: "The server returned a bad HTTP response code",
+                                     ]))
+                } else {
+                    body(fulfiller, rejecter, data, rsp)
                 }
-
-                body(fulfiller, rejecter, data, rsp)
             }
         }
     }

Swift Sources/Promise.swift

@@ -336,14 +336,14 @@ public class Promise<T> {
 
         switch state {
         case .Fulfilled(let value):
-            fulfill(body(value()))
+            fulfill(body(value as! T))
         case .Rejected(let error):
             reject(error)
         case .Pending(let handlers):
             handlers.append({
                 switch self.state {
                 case .Fulfilled(let value):
-                    fulfill(body(value()))
+                    fulfill(body(value as! T))
                 case .Rejected(let error):
                     reject(error)
                 case .Pending:

Swift Sources/SKRequest+Promise.swift

@@ -7,6 +7,7 @@ private class SKRequestProxy: NSObject, SKRequestDelegate {
         fulfill(request)
         PMKRelease(self)
     }
+
     func request(request: SKRequest!, didFailWithError error: NSError!) {
         reject(error)
         PMKRelease(self)
@@ -26,11 +27,11 @@ extension SKRequest {
 private class SKProductsRequestProxy: NSObject, SKProductsRequestDelegate {
     let (promise, fulfill, reject) = Promise<SKProductsResponse>.defer()
 
-    func productsRequest(request: SKProductsRequest!, didReceiveResponse response: SKProductsResponse!) {
+    @objc func productsRequest(request: SKProductsRequest!, didReceiveResponse response: SKProductsResponse!) {
         fulfill(response)
         PMKRelease(self)
     }
-
+    
     func request(request: SKRequest!, didFailWithError error: NSError!) {
         reject(error)
         PMKRelease(self)

Swift Sources/UIViewController+Promise.swift

@@ -45,12 +45,12 @@ private var key = "PMKSomeString"
 
 extension UIViewController {
     public func fulfill(value: Any) {
-        let resolver = objc_getAssociatedObject(self, &key) as Resolver
+        let resolver = objc_getAssociatedObject(self, &key) as! Resolver
         resolver.fulfill(value)
     }
 
     public func reject(error:NSError) {
-        let resolver = objc_getAssociatedObject(self, &key) as Resolver
+        let resolver = objc_getAssociatedObject(self, &key) as! Resolver
         resolver.reject(error)
     }
 
@@ -59,7 +59,7 @@ extension UIViewController {
 
         let (promise, f, r) = Promise<T>.defer()
         let fwrap = { (any: Any) in
-            f(any as T)
+            f(any as! T)
         }
 
         objc_setAssociatedObject(vc, &key, Resolver(fulfill: fwrap, reject: r), UInt(OBJC_ASSOCIATION_RETAIN_NONATOMIC))

Swift Sources/race.swift

@@ -8,7 +8,7 @@ public func race<T>(promises: Promise<T>...) -> Promise<(T, Int)> {
             promise.thenUnleashZalgo { value->() in
                 fulfill(value, index)
             }
-            promise.catch(reject)
+            promise.catch(body: reject)
         }
     }
 }