Support Swift 4.1 (#1230)

Kitura · Apr 5, 2018 · 30b8d31 · 30b8d31
1 parent 3d42897
commit 30b8d31
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,14 @@ matrix:
     - os: osx
       osx_image: xcode9.2
       sudo: required
+    - os: linux
+      dist: trusty
+      sudo: required
+      env: SWIFT_SNAPSHOT=swift-4.1-DEVELOPMENT-SNAPSHOT-2018-03-04-a
+    - os: osx
+      osx_image: xcode9.2
+      sudo: required
+      env: SWIFT_SNAPSHOT=swift-4.1-DEVELOPMENT-SNAPSHOT-2018-03-04-a
 
 script:
   - ./build.sh
diff --git a/Sources/Kitura/staticFileServer/FileServer.swift b/Sources/Kitura/staticFileServer/FileServer.swift
@@ -91,10 +91,10 @@ extension StaticFileServer {
             var isDirectory = ObjCBool(false)
 
             if fileManager.fileExists(atPath: filePath, isDirectory: &isDirectory) {
-                #if os(Linux)
-                    let isDirectoryBool = isDirectory
-                #else
+                #if !os(Linux) || swift(>=4.1)
                     let isDirectoryBool = isDirectory.boolValue
+                #else
+                    let isDirectoryBool = isDirectory
                 #endif
                 serveExistingFile(filePath, requestPath: requestPath,
                                   isDirectory: isDirectoryBool, response: response)
@@ -130,10 +130,10 @@ extension StaticFileServer {
         private func serveIfNonDirectoryFile(atPath path: String, response: RouterResponse) -> Bool {
             var isDirectory = ObjCBool(false)
             if FileManager().fileExists(atPath: path, isDirectory: &isDirectory) {
-                #if os(Linux)
-                    let isDirectoryBool = isDirectory
-                #else
+                #if !os(Linux) || swift(>=4.1)
                     let isDirectoryBool = isDirectory.boolValue
+                #else
+                    let isDirectoryBool = isDirectory
                 #endif
                 if !isDirectoryBool {
                     serveNonDirectoryFile(path, response: response)