Merge pull request JohnSundell#53 from iainsmith/4.0

Add support for Swift 4.0 & update CI
shadow-jafar · Apr 10, 2018 · 06f95bd · 06f95bd
2 parents 4359654 + f1dcfbf
commit 06f95bd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,14 @@
-os: linux
+os:
+    - linux
+    - osx
 language: generic
 osx_image: xcode9
 sudo: required
 dist: trusty
+env:
+    - SWIFT_VERSION=4.0
+    - SWIFT_VERSION=4.1
 install:
-    - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+    - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
 script:
     - swift test
diff --git a/Sources/Files.swift b/Sources/Files.swift
@@ -1112,6 +1112,12 @@ private extension ProcessInfo {
     }
 }
 
+#if os(Linux) && !(swift(>=4.1))
+private extension ObjCBool {
+    var boolValue: Bool { return Bool(self) }
+}
+#endif
+
 #if !os(Linux)
 extension FileSystem {
     /// A reference to the document folder used by this file system.