Merge pull request #1031 from mxcl/v7-travis-swift-5-GM

[travis] Swift 5 GM; Fix Linux compile
mxcl · Apr 7, 2019 · a871593 · a871593
2 parents 4c09a11 + 7600e18
commit a871593
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -42,7 +42,7 @@ jobs:
       xcode_destination: 'OS=12.2,name=Apple TV'
 
     - name: Linux
-      env: SWIFT_VERSION='5.0-DEVELOPMENT-SNAPSHOT-2019-01-22-a'
+      env: SWIFT_VERSION='5.0'
       os: linux
       language: generic
       osx_image: null

diff --git a/Sources/hang.swift b/Sources/hang.swift
@@ -14,7 +14,7 @@ import CoreFoundation
 */
 public func hang<T>(_ promise: Promise<T>) throws -> T {
 #if os(Linux) || os(Android)
-#if swift(>=4.2)
+#if compiler(>=5)
     let runLoopMode: CFRunLoopMode = kCFRunLoopDefaultMode
 #else
     // isMainThread is not yet implemented on Linux.