PMK 5.0.0

Author: mxcl

.gitignore

@@ -2,3 +2,4 @@ xcuserdata
 *.xcscmblueprint
 /Carthage
 /.build
+.DS_Store

Cartfile

@@ -1 +1 @@
-github "mxcl/PromiseKit" ~> 4.0
+github "mxcl/PromiseKit" ~> 5.0

Sources/MKDirections+Promise.swift

@@ -1,5 +1,5 @@
 import MapKit
-#if !COCOAPODS
+#if !PMKCocoaPods
 import PromiseKit
 #endif
 
@@ -16,11 +16,11 @@ import PromiseKit
 extension MKDirections {
     /// Begins calculating the requested route information asynchronously.
     public func calculate() -> Promise<MKDirectionsResponse> {
-        return PromiseKit.wrap(calculate)
+        return Promise(.pending) { calculate(completionHandler: $0.resolve) }
     }
 
     /// Begins calculating the requested travel-time information asynchronously.
     public func calculateETA() -> Promise<MKETAResponse> {
-        return PromiseKit.wrap(calculateETA)
+        return Promise(.pending) { calculateETA(completionHandler: $0.resolve) }
     }
 }

Sources/MKMapSnapshotter+Promise.swift

@@ -1,5 +1,5 @@
 import MapKit
-#if !COCOAPODS
+#if !PMKCocoaPods
 import PromiseKit
 #endif
 
@@ -16,6 +16,6 @@ import PromiseKit
 extension MKMapSnapshotter {
     /// Starts generating the snapshot using the options set in this object.
     public func start() -> Promise<MKMapSnapshot> {
-        return PromiseKit.wrap(start)
+        return Promise(.pending) { start(completionHandler: $0.resolve) }
     }
 }

Tests/TestMapKit.swift

@@ -16,7 +16,7 @@ class Test_MKDirections_Swift: XCTestCase {
         let rq = MKDirectionsRequest()
         let directions = MockDirections(request: rq)
 
-        directions.calculate().then { _ in
+        directions.calculate().done { _ in
             ex.fulfill()
         }
 
@@ -34,7 +34,7 @@ class Test_MKDirections_Swift: XCTestCase {
         }
 
         let rq = MKDirectionsRequest()
-        MockDirections(request: rq).calculateETA().then { (rsp: MKETAResponse) in
+        MockDirections(request: rq).calculateETA().done { rsp in
             ex.fulfill()
         }
 
@@ -54,7 +54,7 @@ class Test_MKSnapshotter_Swift: XCTestCase {
         }
 
         let snapshotter = MockSnapshotter()
-        snapshotter.start().then { _ in
+        snapshotter.start().done { _ in
             ex.fulfill()
         }