Fix tests with Xcode 8.3

Author: mxcl

.gitignore

@@ -1,5 +1,4 @@
-*.xcodeproj/**/xcuserdata/
+xcuserdata
 *.xcscmblueprint
 /Carthage
-/Cartfile.resolved
 /.build

.travis.yml

@@ -1,26 +1,27 @@
 language: objective-c
 osx_image: xcode8.3
-
+matrix:
+  include:
+    - osx_image: xcode8
+    - osx_image: xcode8.1
+    - osx_image: xcode8.2
+    - osx_image: xcode9
 env:
   - PLATFORM=Mac
   - PLATFORM=iOS NAME='iPhone SE'
   - PLATFORM=tvOS NAME='Apple TV 1080p'
-
 before_install:
   - if [ -n "$NAME" ]; then
       export UUID=$(instruments -s | ruby -e "ARGF.each_line{ |ln| ln =~ /$NAME .* \[(.*)\]/; if \$1; puts(\$1); exit; end }");
     fi
-
 install:
   - carthage bootstrap --platform $PLATFORM
-
 script:
   - set -o pipefail;
     case $PLATFORM in
     Mac)
       xcodebuild -scheme PMKMapKit test | xcpretty;;
     iOS|tvOS)
-      xcrun instruments -w "$UUID";
-      sleep 15;
+      open -a "simulator" --args -CurrentDeviceUDID "$UUID";
       xcodebuild -scheme PMKMapKit -destination "id=$UUID" test | xcpretty;;
     esac

PMKMapKit.xcodeproj/project.pbxproj

@@ -166,7 +166,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = "Max Howell";
 				TargetAttributes = {
 					63C7FFA61D5BEE09003BAE60 = {
@@ -267,6 +267,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -325,6 +326,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

PMKMapKit.xcodeproj/xcshareddata/xcschemes/PMKMapKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Tests/TestMapKit.swift

@@ -8,7 +8,7 @@ class Test_MKDirections_Swift: XCTestCase {
         let ex = expectation(description: "")
 
         class MockDirections: MKDirections {
-            private override func calculate(completionHandler: @escaping MKDirectionsHandler) {
+            override func calculate(completionHandler: @escaping MKDirectionsHandler) {
                 completionHandler(MKDirectionsResponse(), nil)
             }
         }
@@ -28,7 +28,7 @@ class Test_MKDirections_Swift: XCTestCase {
         let ex = expectation(description: "")
 
         class MockDirections: MKDirections {
-            private override func calculateETA(completionHandler: @escaping MKETAHandler) {
+            override func calculateETA(completionHandler: @escaping MKETAHandler) {
                 completionHandler(MKETAResponse(), nil)
             }
         }
@@ -48,7 +48,7 @@ class Test_MKSnapshotter_Swift: XCTestCase {
         let ex = expectation(description: "")
 
         class MockSnapshotter: MKMapSnapshotter {
-            private override func start(completionHandler: @escaping MKMapSnapshotCompletionHandler) {
+            override func start(completionHandler: @escaping MKMapSnapshotCompletionHandler) {
                 completionHandler(MKMapSnapshot(), nil)
             }
         }