Xcode 10.2 adjustments

Author: mxcl

.travis.yml

@@ -1,18 +1,20 @@
+os: osx
+language: swift
+osx_image: xcode10.2
+
 branches:
-  only:
+  only: 
     - master
 stages:
   - lint
+  - carthage
   - test
 jobs:
   include:
     - &pod
       stage: lint
       osx_image: xcode8.3
       env: SWIFT=3.1
-      name: pod lib lint --swift-version=3.1
-      os: osx
-      language: objective-c
       before_install:
         gem install cocoapods --prerelease --version 1.7.0.beta.3
       install:
@@ -26,50 +28,53 @@ jobs:
     - <<: *pod
       osx_image: xcode9.2
       env: SWIFT=3.2
-      name: pod lib lint --swift-version=3.2
     - <<: *pod
       osx_image: xcode9.4
       env: SWIFT=3.3
-      name: pod lib lint --swift-version=3.3
-    - <<: *pod
-      osx_image: xcode10.1
-      env: SWIFT=3.4
-      name: pod lib lint --swift-version=3.4
+    # - <<: *pod
+    #   osx_image: xcode10
+    #   env: SWIFT=3.4
     - <<: *pod
       osx_image: xcode9.2
       env: SWIFT=4.0
-      name: pod lib lint --swift-version=4.0
     - <<: *pod
       osx_image: xcode9.4
       env: SWIFT=4.1
-      name: pod lib lint --swift-version=4.1
     - <<: *pod
-      osx_image: xcode10.1
+      osx_image: xcode10
       env: SWIFT=4.2
-      name: pod lib lint --swift-version=4.2
     - <<: *pod
       osx_image: xcode10.2
       env: SWIFT=5.0
-      name: pod lib lint --swift-version=5.0
+
+    - &carthage
+      stage: carthage
+      osx_image: xcode9.2
+      script: |
+        carthage bootstrap --cache-builds
+        carthage build --no-skip-current
+      cache:
+        directories:
+        - Carthage
+    - <<: *carthage
+      osx_image: xcode9.4
+    - <<: *carthage
+      osx_image: xcode10.1
+    - <<: *carthage
+      osx_image: xcode10.2
+
     - &test
       stage: test
-      osx_image: xcode10.2
-      name: macOS Tests
-      env: DST='arch=x86_64' PLAT=macOS
-      os: osx
-      language: objective-c
+      xcode_scheme: PMKMapKit
+      xcode_project: PMKMapKit.xcodeproj
+      xcode_destination: 'platform=macOS'
       cache:
         directories:
         - Carthage
-      before_install:
-        carthage bootstrap --cache-builds --no-use-binaries --platform $PLAT
-      install:
-        xcodebuild -scheme PMKMapKit -target PMKMapKit -quiet -destination "$DST" SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build
-      script:
-        xcodebuild -scheme PMKMapKit -quiet -destination "$DST" test
+      before_install: |
+        carthage bootstrap --cache-builds --no-use-binaries
+        sed -i '' "s/SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;/SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;/" *.xcodeproj/project.pbxproj
     - <<: *test
-      env: DST='OS=12.0,name=iPhone SE' PLAT=iOS
-      name: iOS Tests
+      xcode_destination: 'platform=iOS Simulator,OS=12.2,name=iPhone SE'
     - <<: *test
-      env: DST='OS=12.0,name=Apple TV' PLAT=tvOS
-      name: tvOS Tests
+      xcode_destination: 'platform=Apple TV Simulator,OS=12.2,name=Apple TV'

PMKMapKit.xcodeproj/project.pbxproj

@@ -169,12 +169,12 @@
 				TargetAttributes = {
 					63C7FFA61D5BEE09003BAE60 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					63C7FFF11D5C020D003BAE60 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -392,6 +392,7 @@
 				PRODUCT_MODULE_NAME = "${TARGET_NAME}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 			};
 			name = Debug;
 		};
@@ -408,6 +409,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_MODULE_NAME = "${TARGET_NAME}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 			};
 			name = Release;
 		};
@@ -421,7 +423,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SUPPRESS_WARNINGS = YES;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -434,7 +435,6 @@
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SUPPRESS_WARNINGS = YES;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};