Migrate to Swift 3

.gitignore

@@ -9,3 +9,6 @@ xcuserdata
 *.xcscmblueprint
 
 Pods/
+
+Carthage/Build
+Carthage/Checkouts

Cartfile

@@ -0,0 +1 @@
+github "raphaelmor/Polyline" "f86f34dac9aae7e027fd9f62c2e01dd77f1ee312"

Cartfile.private

@@ -0,0 +1 @@
+github "AliSoftware/OHHTTPStubs" "swift-3.0"

Cartfile.resolved

@@ -0,0 +1,2 @@
+github "AliSoftware/OHHTTPStubs" "57feceaabf333e72b2c637dfba6c13a7a5c49619"
+github "raphaelmor/Polyline" "f86f34dac9aae7e027fd9f62c2e01dd77f1ee312"

Example/Directions Example Tests/DummyTest.m

@@ -0,0 +1,39 @@
+//
+//  DummyTest.m
+//  DirectionsExample
+//
+//  Created by Simon Seyer on 07/12/2016.
+//  Copyright © 2016 Mapbox. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+
+@interface DummyTest : XCTestCase
+
+@end
+
+@implementation DummyTest
+
+- (void)setUp {
+    [super setUp];
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+    [super tearDown];
+}
+
+- (void)testExample {
+    // This is an example of a functional test case.
+    // Use XCTAssert and related functions to verify your tests produce the correct results.
+}
+
+- (void)testPerformanceExample {
+    // This is an example of a performance test case.
+    [self measureBlock:^{
+        // Put the code you want to measure the time of here.
+    }];
+}
+
+@end

Example/Directions Example Tests/DummyTest.swift

@@ -0,0 +1,35 @@
+//
+//  DummyTest.swift
+//  DirectionsExample
+//
+//  Created by Simon Seyer on 07/12/2016.
+//  Copyright © 2016 Mapbox. All rights reserved.
+//
+
+import XCTest
+
+class DummyTest: XCTestCase {
+
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+    func testExample() {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    }
+
+    func testPerformanceExample() {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}

Directions Example/AppDelegate.swift → Example/Directions Example/AppDelegate.swift

@@ -5,9 +5,9 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
-
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
-        window = UIWindow(frame: UIScreen.mainScreen().bounds)
+    
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
+        window = UIWindow(frame: UIScreen.main.bounds)
         window!.rootViewController = ViewController(nibName: nil, bundle: nil)
         window!.makeKeyAndVisible()
 

Directions Example/ViewController.swift → Example/Directions Example/ViewController.swift

@@ -17,11 +17,11 @@ class ViewController: UIViewController {
         MGLAccountManager.setAccessToken(MapboxAccessToken)
 
         mapView = MGLMapView(frame: view.bounds)
-        mapView.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]
+        mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         view.addSubview(mapView)
     }
 
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
         let options = RouteOptions(waypoints: [
@@ -30,28 +30,28 @@ class ViewController: UIViewController {
         ])
         options.includesSteps = true
 
-        Directions(accessToken: MapboxAccessToken).calculateDirections(options: options) { (waypoints, routes, error) in
+        _ = Directions(accessToken: MapboxAccessToken).calculate(options) { (waypoints, routes, error) in
             guard error == nil else {
                 print("Error calculating directions: \(error!)")
                 return
             }
 
-            if let route = routes?.first, leg = route.legs.first {
+            if let route = routes?.first, let leg = route.legs.first {
                 print("Route via \(leg):")
 
-                let distanceFormatter = NSLengthFormatter()
-                let formattedDistance = distanceFormatter.stringFromMeters(route.distance)
+                let distanceFormatter = LengthFormatter()
+                let formattedDistance = distanceFormatter.string(fromMeters: route.distance)
 
-                let travelTimeFormatter = NSDateComponentsFormatter()
-                travelTimeFormatter.unitsStyle = .Short
-                let formattedTravelTime = travelTimeFormatter.stringFromTimeInterval(route.expectedTravelTime)
+                let travelTimeFormatter = DateComponentsFormatter()
+                travelTimeFormatter.unitsStyle = .short
+                let formattedTravelTime = travelTimeFormatter.string(from: route.expectedTravelTime)
 
                 print("Distance: \(formattedDistance); ETA: \(formattedTravelTime!)")
 
                 for step in leg.steps {
                     print("\(step.instructions)")
                     if step.distance > 0 {
-                        let formattedDistance = distanceFormatter.stringFromMeters(step.distance)
+                        let formattedDistance = distanceFormatter.string(fromMeters: step.distance)
                         print("— \(formattedDistance) —")
                     }
                 }
@@ -63,7 +63,7 @@ class ViewController: UIViewController {
 
                     // Add the polyline to the map and fit the viewport to the polyline.
                     self.mapView.addAnnotation(routeLine)
-                    self.mapView.setVisibleCoordinates(&routeCoordinates, count: route.coordinateCount, edgePadding:                 UIEdgeInsetsZero, animated: true)
+                    self.mapView.setVisibleCoordinates(&routeCoordinates, count: route.coordinateCount, edgePadding: .zero, animated: true)
                 }
             }
         }