update CI configuration

glessard · Sep 1, 2018 · 18db2e1 · 18db2e1
1 parent b0ce497
commit 18db2e1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,20 +6,24 @@ matrix:
       dist: trusty
       language: generic
       sudo: required
-      env: SWIFT_VERSION=3.2 CLANG_VERSION=3.6
+      env: SWIFT_VERSION=3.2
 
     - os: linux
       dist: trusty
       language: generic
       sudo: required
-      env: SWIFT_VERSION=4.1.1
+      env: SWIFT_VERSION=4.1.3
 
     - os: osx
       osx_image: xcode9
       env: SWIFT_VERSION=3.2
 
     - os: osx
       osx_image: xcode9.4
+      env: SWIFT_VERSION=4.1.2
+
+    - os: osx
+      osx_image: xcode10
 
 before_install:
   - sudo /bin/bash Tests/install-clang.sh

diff --git a/Package.swift b/Package.swift
@@ -1,7 +1,13 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
 
 import PackageDescription
 
+#if !swift(>=4.2)
+let versions = [3,4]
+#else
+let versions = [SwiftVersion.v3, .v4, .v4_2]
+#endif
+
 #if swift(>=4.0)
 
 let package = Package(
@@ -16,7 +22,7 @@ let package = Package(
     .target(name: "deferred", dependencies: ["CAtomics"]),
     .testTarget(name: "deferredTests", dependencies: ["deferred"]),
   ],
-  swiftLanguageVersions: [3,4]
+  swiftLanguageVersions: versions
 )
 
 #else