Merge branch 'master' into CoreCancel

Author: dougzilla32

Sources/MKDirections+Promise.swift

@@ -1,41 +1,41 @@
-import MapKit
-#if !PMKCocoaPods
-import PromiseKit
-#endif
-
-/**
- To import the `MKDirections` category:
-
-    use_frameworks!
-    pod "PromiseKit/MapKit"
-
- And then in your sources:
-
-    import PromiseKit
-*/
-extension MKDirections {
-#if swift(>=4.2)
-    /// Begins calculating the requested route information asynchronously.
-    public func calculate() -> Promise<Response> {
-        return Promise<Response>(cancellableTask: MKDirectionsTask(self)) { calculate(completionHandler: $0.resolve) }
-    }
-
-    /// Begins calculating the requested travel-time information asynchronously.
-    public func calculateETA() -> Promise<ETAResponse> {
-        return Promise<ETAResponse>(cancellableTask: MKDirectionsTask(self)) { calculateETA(completionHandler: $0.resolve) }
-    }
-#else
-    /// Begins calculating the requested route information asynchronously.
-    public func calculate() -> Promise<MKDirectionsResponse> {
-        return Promise<MKDirectionsResponse>(cancellableTask: MKDirectionsTask(self)) { calculate(completionHandler: $0.resolve) }
-    }
-
-    /// Begins calculating the requested travel-time information asynchronously.
-    public func calculateETA() -> Promise<MKETAResponse> {
-        return Promise<MKETAResponse>(cancellableTask: MKDirectionsTask(self)) { calculateETA(completionHandler: $0.resolve) }
-    }
-#endif
-}
+import MapKit
+#if !PMKCocoaPods
+import PromiseKit
+#endif
+
+/**
+ To import the `MKDirections` category:
+
+    use_frameworks!
+    pod "PromiseKit/MapKit"
+
+ And then in your sources:
+
+    import PromiseKit
+*/
+extension MKDirections {
+#if swift(>=4.2)
+    /// Begins calculating the requested route information asynchronously.
+    public func calculate() -> Promise<Response> {
+        return Promise<Response>(cancellableTask: MKDirectionsTask(self)) { calculate(completionHandler: $0.resolve) }
+    }
+
+    /// Begins calculating the requested travel-time information asynchronously.
+    public func calculateETA() -> Promise<ETAResponse> {
+        return Promise<ETAResponse>(cancellableTask: MKDirectionsTask(self)) { calculateETA(completionHandler: $0.resolve) }
+    }
+#else
+    /// Begins calculating the requested route information asynchronously.
+    public func calculate() -> Promise<MKDirectionsResponse> {
+        return Promise<MKDirectionsResponse>(cancellableTask: MKDirectionsTask(self)) { calculate(completionHandler: $0.resolve) }
+    }
+
+    /// Begins calculating the requested travel-time information asynchronously.
+    public func calculateETA() -> Promise<MKETAResponse> {
+        return Promise<MKETAResponse>(cancellableTask: MKDirectionsTask(self)) { calculateETA(completionHandler: $0.resolve) }
+    }
+#endif
+}
 
 private class MKDirectionsTask: CancellableTask {
     let directions: MKDirections

Sources/MKMapSnapshotter+Promise.swift

@@ -1,31 +1,31 @@
-import MapKit
-#if !PMKCocoaPods
-import PromiseKit
-#endif
-
-/**
- To import the `MKMapSnapshotter` category:
-
-    use_frameworks!
-    pod "PromiseKit/MapKit"
-
- And then in your sources:
-
-    import PromiseKit
-*/
-extension MKMapSnapshotter {
-#if swift(>=4.2)
-    /// Starts generating the snapshot using the options set in this object.
-    public func start() -> Promise<Snapshot> {
-        return Promise<Snapshot>(cancellableTask: MKMapSnapshotterTask(self)) { start(completionHandler: $0.resolve) }
-    }
-#else
-    /// Starts generating the snapshot using the options set in this object.
-    public func start() -> Promise<MKMapSnapshot> {
-        return Promise<MKMapSnapshot>(cancellableTask: MKMapSnapshotterTask(self)) { start(completionHandler: $0.resolve) }
-    }
-#endif
-}
+import MapKit
+#if !PMKCocoaPods
+import PromiseKit
+#endif
+
+/**
+ To import the `MKMapSnapshotter` category:
+
+    use_frameworks!
+    pod "PromiseKit/MapKit"
+
+ And then in your sources:
+
+    import PromiseKit
+*/
+extension MKMapSnapshotter {
+#if swift(>=4.2)
+    /// Starts generating the snapshot using the options set in this object.
+    public func start() -> Promise<Snapshot> {
+        return Promise<Snapshot>(cancellableTask: MKMapSnapshotterTask(self)) { start(completionHandler: $0.resolve) }
+    }
+#else
+    /// Starts generating the snapshot using the options set in this object.
+    public func start() -> Promise<MKMapSnapshot> {
+        return Promise<MKMapSnapshot>(cancellableTask: MKMapSnapshotterTask(self)) { start(completionHandler: $0.resolve) }
+    }
+#endif
+}
 
 private class MKMapSnapshotterTask: CancellableTask {
     let snapshotter: MKMapSnapshotter