Merge branch 'master' into CoreCancel

Author: dougzilla32

.travis.yml

@@ -14,6 +14,10 @@ matrix:
     - {osx_image: xcode9.4,   env: 'PLAT=iOS     SWFT=3.3 DST="OS=11.4,name=iPhone 5s"'}
     - {osx_image: xcode9.4,   env: 'PLAT=tvOS    SWFT=3.3 DST="OS=11.4,name=Apple TV"'}
 
+    - {osx_image: xcode10,    env: 'PLAT=macOS   SWFT=3.4 DST="arch=x86_64"'}
+    - {osx_image: xcode10,    env: 'PLAT=iOS     SWFT=3.4 DST="OS=12.0,name=iPhone SE"'}
+    - {osx_image: xcode10,    env: 'PLAT=tvOS    SWFT=3.4 DST="OS=12.0,name=Apple TV"'}
+
     - {osx_image: xcode9.2,   env: 'PLAT=macOS   SWFT=4.0 DST="arch=x86_64"'}
     - {osx_image: xcode9.2,   env: 'PLAT=iOS     SWFT=4.0 DST="OS=11.2,name=iPhone SE"'}
     - {osx_image: xcode9.2,   env: 'PLAT=tvOS    SWFT=4.0 DST="OS=11.2,name=Apple TV"'}
@@ -25,6 +29,10 @@ matrix:
     - {osx_image: xcode9.4,   env: 'PLAT=iOS     SWFT=4.1 DST="OS=11.4,name=iPhone 5s" TEST=1'}
     - {osx_image: xcode9.3,   env: 'PLAT=tvOS    SWFT=4.1 DST="OS=10.2,name=Apple TV 1080p"'}
     - {osx_image: xcode9.4,   env: 'PLAT=tvOS    SWFT=4.1 DST="OS=11.4,name=Apple TV" TEST=1'}
+
+    - {osx_image: xcode10,    env: 'PLAT=macOS   SWFT=4.2 DST="arch=x86_64"'}
+    - {osx_image: xcode10,    env: 'PLAT=iOS     SWFT=4.2 DST="OS=12.0,name=iPhone SE"'}
+    - {osx_image: xcode10,    env: 'PLAT=tvOS    SWFT=4.2 DST="OS=12.0,name=Apple TV"'}
 cache:
   directories:
   - Carthage

Cartfile.resolved

@@ -1 +1 @@
-github "dougzilla32/PromiseKit" "dcf77e0afe55e3d18da9a2a5bda28cdf1adcb5a9"
+github "dougzilla32/PromiseKit" "dcf77e0afe55e3d18da9a2a5bda28cdf1adcb5a9"

Sources/MKDirections+Promise.swift

@@ -14,6 +14,17 @@ import PromiseKit
     import PromiseKit
 */
 extension MKDirections {
+#if swift(>=4.2)
+    /// Begins calculating the requested route information asynchronously.
+    public func calculate() -> Promise<Response> {
+        return Promise { calculate(completionHandler: $0.resolve) }
+    }
+
+    /// Begins calculating the requested travel-time information asynchronously.
+    public func calculateETA() -> Promise<ETAResponse> {
+        return Promise { 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) }
@@ -23,6 +34,7 @@ extension MKDirections {
     public func calculateETA() -> Promise<MKETAResponse> {
         return Promise<MKETAResponse>(cancellableTask: MKDirectionsTask(self)) { calculateETA(completionHandler: $0.resolve) }
     }
+#endif
 }
 
 private class MKDirectionsTask: CancellableTask {

Sources/MKMapSnapshotter+Promise.swift

@@ -14,10 +14,17 @@ import PromiseKit
     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 { 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 {