From 50853817fac32571fcc999e3107137676fb097ce Mon Sep 17 00:00:00 2001
From: Max Howell <mxcl@me.com>
Date: Tue, 26 Mar 2019 18:12:12 -0400
Subject: [PATCH] [travis] Update to Swift 5 GM

---
 .travis.yml                           | 25 ++++++++++++++++---------
 Cartfile.resolved                     |  2 +-
 PMKCloudKit.xcodeproj/project.pbxproj |  4 ++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ccea08d..475f4f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 branches:
-  only: 
+  only:
     - master
 stages:
   - lint
@@ -16,7 +16,7 @@ jobs:
       os: osx
       language: objective-c
       before_install:
-        gem install cocoapods --prerelease --version 1.6.0.beta.1
+        gem install cocoapods --prerelease --version 1.7.0.beta.2
       install:
         carthage bootstrap --no-build PromiseKit
       script: |
@@ -49,9 +49,13 @@ jobs:
       osx_image: xcode10.1
       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
 
     - stage: carthage
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       name: Carthage / watchOS
       os: osx
       language: objective-c
@@ -60,14 +64,17 @@ jobs:
       cache:
         directories:
         - Carthage
-    
+
     - &swiftpm
       stage: swiftpm
-      osx_image: xcode10.1
-      name: swift build (tools-version-4.2)
+      osx_image: xcode10.2
+      name: swift build (tools-version-5.0)
       os: osx
       language: objective-c
       script: swift build -Xswiftc -target -Xswiftc x86_64-apple-macosx10.12
+    - <<: *swiftpm
+      osx_image: xcode10.1
+      name: swift build (tools-version-4.2)
     - <<: *swiftpm
       osx_image: xcode9.2
       name: swift build (tools-version-4.0)
@@ -77,7 +84,7 @@ jobs:
 
     - &test
       stage: test
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       name: macOS Tests
       env: DST='arch=x86_64' PLAT=macOS
       os: osx
@@ -92,8 +99,8 @@ jobs:
       script:
         xcodebuild -scheme PMKCloudKit -quiet -destination "$DST" test
     - <<: *test
-      env: DST='OS=12.0,name=iPhone SE' PLAT=iOS
+      env: DST='OS=12.2,name=iPhone SE' PLAT=iOS
       name: iOS Tests
     - <<: *test
-      env: DST='OS=12.0,name=Apple TV' PLAT=tvOS
+      env: DST='OS=12.2,name=Apple TV' PLAT=tvOS
       name: tvOS Tests
diff --git a/Cartfile.resolved b/Cartfile.resolved
index d903612..f54bbdb 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1 +1 @@
-github "mxcl/PromiseKit" "6.5.0"
+github "mxcl/PromiseKit" "6.8.4"
diff --git a/PMKCloudKit.xcodeproj/project.pbxproj b/PMKCloudKit.xcodeproj/project.pbxproj
index 6aca5dd..51ba42f 100644
--- a/PMKCloudKit.xcodeproj/project.pbxproj
+++ b/PMKCloudKit.xcodeproj/project.pbxproj
@@ -311,7 +311,7 @@
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchsimulator watchos macosx appletvsimulator appletvos";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -371,7 +371,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.CloudKit;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchsimulator watchos macosx appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALIDATE_PRODUCT = YES;