Merge pull request #6 from flitsmeister/feature/0.23.1-spm

SPM support

.swift-version

@@ -1 +1 @@
-4.0
+5.9

Cartfile.private

@@ -1,2 +1 @@
 binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 3.4
-github "AliSoftware/OHHTTPStubs" ~> 6.0

Cartfile.resolved

@@ -1,3 +1,2 @@
 binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "3.7.8"
-github "AliSoftware/OHHTTPStubs" "6.1.0"
-github "raphaelmor/Polyline" "v5.1.0"
+github "raphaelmor/Polyline" "v5.1.0"

MapboxDirections/MBAttribute.swift

@@ -1,4 +1,5 @@
 import Foundation
+import MapboxDirectionsObjc
 
 public typealias AttributeOptions = MBAttributeOptions
 

MapboxDirections/MBDirections.swift

@@ -1,3 +1,5 @@
+import CoreLocation
+
 typealias JSONDictionary = [String: Any]
 
 /// Indicates that an error occurred in MapboxDirections.

MapboxDirections/MBDirectionsOptions.swift

@@ -1,5 +1,6 @@
 import Foundation
 import Polyline
+import MapboxDirectionsObjc
 
 /**
  A `RouteShapeFormat` indicates the format of a route or match shape in the raw HTTP response.

MapboxDirections/MBDirectionsResult.swift

@@ -1,3 +1,4 @@
+import CoreLocation
 import Polyline
 
 /**

MapboxDirections/MBIntersection.swift

@@ -1,4 +1,5 @@
 import Foundation
+import CoreLocation
 
 /**
  A single cross street along a step.

MapboxDirections/MBLaneIndication.swift

@@ -1,4 +1,5 @@
 import Foundation
+import MapboxDirectionsObjc
 
 public typealias LaneIndication = MBLaneIndication
 

MapboxDirections/MBLaneIndicationComponent.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /**
 A component that represents a lane  representation of an instruction.
  */

MapboxDirections/MBRoadClasses.swift

@@ -1,4 +1,5 @@
 import Foundation
+import MapboxDirectionsObjc
 
 public typealias RoadClasses = MBRoadClasses
 

MapboxDirections/MBRoute.swift

@@ -1,3 +1,4 @@
+import CoreLocation
 import Polyline
 
 /**

MapboxDirections/MBRouteLeg.swift

@@ -1,4 +1,6 @@
+import CoreLocation
 import Polyline
+import MapboxDirectionsObjc
 
 /**
  A `RouteLeg` object defines a single leg of a route between two waypoints. If the overall route has only two waypoints, it has a single `RouteLeg` object that covers the entire route. The route leg object includes information about the leg, such as its name, distance, and expected travel time. Depending on the criteria used to calculate the route, the route leg object may also include detailed turn-by-turn instructions.

MapboxDirections/MBRouteOptions.swift

@@ -1,3 +1,6 @@
+import CoreLocation
+import MapboxDirectionsObjc
+
 /**
  A `RouteOptions` object is a structure that specifies the criteria for results returned by the Mapbox Directions API.
 

MapboxDirections/MBRouteStep.swift

@@ -1,4 +1,6 @@
+import CoreLocation
 import Polyline
+import MapboxDirectionsObjc
 
 /**
  A `TransportType` specifies the mode of transportation used for part of a route.

MapboxDirections/MBSpokenInstruction.swift

@@ -1,4 +1,4 @@
-import Foundation
+import CoreLocation
 
 /**
  An instruction about an upcoming `RouteStep`’s maneuver, optimized for speech synthesis.

MapboxDirections/MBVisualInstruction.swift

@@ -1,4 +1,5 @@
 import Foundation
+import CoreLocation
 
 /**
  The contents of a banner that should be displayed as added visual guidance for a route. The banner instructions are children of the steps during which they should be displayed, but they refer to the maneuver in the following step.

MapboxDirections/MBVisualInstructionBanner.swift

@@ -1,4 +1,4 @@
-import Foundation
+import CoreLocation
 
 /**
  A visual instruction banner contains all the information necessary for creating a visual cue about a given `RouteStep`.

MapboxDirections/MBWaypoint.swift

@@ -1,3 +1,5 @@
+import CoreLocation
+
 /**
  A `Waypoint` object indicates a location along a route. It may be the route’s origin or destination, or it may be another location that the route visits. A waypoint object indicates the location’s geographic location along with other optional information, such as a name or the user’s direction approaching the waypoint. You create a `RouteOptions` object using waypoint objects and also receive waypoint objects in the completion handler of the `Directions.calculate(_:completionHandler:)` method.
  */

MapboxDirections/Match/MBMatch.swift

@@ -1,3 +1,4 @@
+import CoreLocation
 import Polyline
 
 /**

MapboxDirections/Match/MBMatchOptions.swift

@@ -1,4 +1,5 @@
 import Foundation
+import MapboxDirectionsObjc
 
 /**
  A `MatchOptions` object is a structure that specifies the criteria for results returned by the Mapbox Map Matching API.

MapboxDirections/Match/MBTracepoint.swift

@@ -1,4 +1,5 @@
-import Foundation
+import CoreLocation
+
 /**
  A `Tracepoint` represents a location matched to the road network.
  */

MapboxDirections/MapboxDirections.h → MapboxDirectionsObjc/include/MapboxDirections.h

@@ -7,7 +7,7 @@ FOUNDATION_EXPORT double MapboxDirectionsVersionNumber;
 //! Project version string for MapboxDirections.
 FOUNDATION_EXPORT const unsigned char MapboxDirectionsVersionString[];
 
-#import "MBLaneIndication.h"
-#import "MBAttribute.h"
-#import "MBRouteOptions.h"
-#import "MBRoadClasses.h"
+#import "../MBLaneIndication.h"
+#import "../MBAttribute.h"
+#import "../MBRouteOptions.h"
+#import "../MBRoadClasses.h"

MapboxDirectionsTests/AnnotationTests.swift

@@ -1,10 +1,12 @@
 import XCTest
+import CoreLocation
 import OHHTTPStubs
+import OHHTTPStubsSwift
 @testable import MapboxDirections
 
 class AnnotationTests: XCTestCase {
     override func tearDown() {
-        OHHTTPStubs.removeAllStubs()
+        HTTPStubs.removeAllStubs()
         super.tearDown()
     }
 
@@ -23,8 +25,8 @@ class AnnotationTests: XCTestCase {
 
         stub(condition: isHost("api.mapbox.com")
             && containsQueryParams(queryParams)) { _ in
-                let path = Bundle(for: type(of: self)).path(forResource: "annotation", ofType: "json")
-                return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
+            let path = Bundle.module.path(forResource: "annotation", ofType: "json")
+                return HTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
         }
 
         let options = RouteOptions(coordinates: [

MapboxDirectionsTests/DirectionsTests.swift

@@ -11,7 +11,7 @@ class DirectionsTests: XCTestCase {
     }
 
     override func tearDown() {
-        OHHTTPStubs.removeAllStubs()
+        HTTPStubs.removeAllStubs()
         super.tearDown()
     }
 

MapboxDirectionsTests/IntructionsTests.swift

@@ -1,10 +1,12 @@
 import XCTest
+import CoreLocation
 import OHHTTPStubs
+import OHHTTPStubsSwift
 @testable import MapboxDirections
 
 class SpokenInstructionsTests: XCTestCase {
     override func tearDown() {
-        OHHTTPStubs.removeAllStubs()
+        HTTPStubs.removeAllStubs()
         super.tearDown()
     }
 
@@ -26,8 +28,8 @@ class SpokenInstructionsTests: XCTestCase {
 
         stub(condition: isHost("api.mapbox.com")
             && containsQueryParams(queryParams)) { _ in
-                let path = Bundle(for: type(of: self)).path(forResource: "instructions", ofType: "json")
-                return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
+            let path = Bundle.module.path(forResource: "instructions", ofType: "json")
+                return HTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
         }
 
         let startWaypoint = Waypoint(location:  CLLocation(latitude: 37.780602, longitude: -122.431373), heading: nil, name: "the hotel")
@@ -114,8 +116,8 @@ class SpokenInstructionsTests: XCTestCase {
         ]
 
         stub(condition: isHost("api.mapbox.com") && containsQueryParams(queryParams)) { _ in
-            let path = Bundle(for: type(of: self)).path(forResource: "subLaneInstructions", ofType: "json")
-            return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
+            let path = Bundle.module.path(forResource: "subLaneInstructions", ofType: "json")
+            return HTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
         }
 
         let startWaypoint =  Waypoint(coordinate: CLLocationCoordinate2D(latitude: 39.132063, longitude: -84.531074))
@@ -181,8 +183,8 @@ class SpokenInstructionsTests: XCTestCase {
         ]
 
         stub(condition: isHost("api.mapbox.com") && containsQueryParams(queryParams)) { _ in
-            let path = Bundle(for: type(of: self)).path(forResource: "subVisualInstructions", ofType: "json")
-            return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
+            let path = Bundle.module.path(forResource: "subVisualInstructions", ofType: "json")
+            return HTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
         }
 
         let startWaypoint =  Waypoint(coordinate: CLLocationCoordinate2D(latitude: 37.775469, longitude: -122.449158))

MapboxDirectionsTests/MatchTests.swift

@@ -1,10 +1,12 @@
 import XCTest
+import CoreLocation
 import OHHTTPStubs
+import OHHTTPStubsSwift
 @testable import MapboxDirections
 
 class MatchTests: XCTestCase {
     override func tearDown() {
-        OHHTTPStubs.removeAllStubs()
+        HTTPStubs.removeAllStubs()
         super.tearDown()
     }
 
@@ -21,8 +23,8 @@ class MatchTests: XCTestCase {
         stub(condition: isHost("api.mapbox.com")
             && isMethodPOST()
             && isPath("/matching/v5/mapbox/driving")) { _ in
-                let path = Bundle(for: type(of: self)).path(forResource: "match", ofType: "json")
-                return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
+            let path = Bundle.module.path(forResource: "match", ofType: "json")
+                return HTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
         }
 
         var match: Match!
@@ -109,8 +111,8 @@ class MatchTests: XCTestCase {
         stub(condition: isHost("api.mapbox.com")
             && isMethodPOST()
             && isPath("/matching/v5/mapbox/driving")) { _ in
-                let path = Bundle(for: type(of: self)).path(forResource: "null-tracepoint", ofType: "json")
-                return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
+            let path = Bundle.module.path(forResource: "null-tracepoint", ofType: "json")
+                return HTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
         }
 
         var match: Match!

MapboxDirectionsTests/RoutableMatchTests.swift

@@ -1,10 +1,12 @@
 import XCTest
+import CoreLocation
 import OHHTTPStubs
+import OHHTTPStubsSwift
 @testable import MapboxDirections
 
 class RoutableMatchTest: XCTestCase {
     override func tearDown() {
-        OHHTTPStubs.removeAllStubs()
+        HTTPStubs.removeAllStubs()
         super.tearDown()
     }
 
@@ -21,8 +23,8 @@ class RoutableMatchTest: XCTestCase {
         stub(condition: isHost("api.mapbox.com")
             && isMethodPOST()
             && isPath("/matching/v5/mapbox/driving")) { _ in
-                let path = Bundle(for: type(of: self)).path(forResource: "match", ofType: "json")
-                return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
+            let path = Bundle.module.path(forResource: "match", ofType: "json")
+                return HTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
         }
 
         var route: Route!

MapboxDirectionsTests/RouteOptionsTests.swift

@@ -1,4 +1,5 @@
 import XCTest
+import CoreLocation
 @testable import MapboxDirections
 
 class RouteOptionsTests: XCTestCase {
@@ -50,7 +51,7 @@ class RouteOptionsTests: XCTestCase {
 
 
     private func response(for fixtureName: String, waypoints: [Waypoint] = testWaypoints) -> (waypoints:[Waypoint], route:Route)? {
-        let testBundle = Bundle(for: type(of: self))
+        let testBundle = Bundle.module
         guard let fixtureURL = testBundle.url(forResource:fixtureName, withExtension:"json") else { XCTFail(); return nil }
         guard let fixtureData = try? Data(contentsOf: fixtureURL, options:.mappedIfSafe) else {XCTFail(); return nil }
         guard let fixtureOpaque = try? JSONSerialization.jsonObject(with: fixtureData), let fixture = fixtureOpaque as? JSONDictionary  else { XCTFail(); return nil }

MapboxDirectionsTests/RouteStepTests.swift

@@ -1,4 +1,5 @@
 import XCTest
+import CoreLocation
 @testable import MapboxDirections
 
 class RoadTests: XCTestCase {

MapboxDirectionsTests/V4Tests.swift

@@ -1,10 +1,12 @@
 import XCTest
+import CoreLocation
 import OHHTTPStubs
+import OHHTTPStubsSwift
 @testable import MapboxDirections
 
 class V4Tests: XCTestCase {
     override func tearDown() {
-        OHHTTPStubs.removeAllStubs()
+        HTTPStubs.removeAllStubs()
         super.tearDown()
     }
 
@@ -21,8 +23,8 @@ class V4Tests: XCTestCase {
         stub(condition: isHost("api.mapbox.com")
             && isPath("/v4/directions/mapbox.driving/-122.42,37.78;-77.03,38.91.json")
             && containsQueryParams(queryParams)) { _ in
-                let path = Bundle(for: type(of: self)).path(forResource: "v4_driving_dc_\(shapeFormat)", ofType: "json")
-                return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
+            let path = Bundle.module.path(forResource: "v4_driving_dc_\(shapeFormat)", ofType: "json")
+                return HTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: ["Content-Type": "application/json"])
         }
 
         let options = RouteOptionsV4(coordinates: [