Update PathKit to support Swift 4.1 and 3.2

.swift-version

@@ -1 +1 @@
-4.0
+4.1

.travis.yml

@@ -1,11 +1,34 @@
-os:
-- linux
-- osx
-language: generic
-sudo: required
-dist: trusty
-osx_image: xcode9
+matrix:
+  include:
+    - os: linux
+      language: generic
+      sudo: required
+      dist: trusty
+      env:
+        - SWIFT_VERSION=4.0.3
+        - MAJOR_VERSION=4
+    - os: linux
+      language: generic
+      sudo: required
+      dist: trusty
+      env:
+        - SWIFT_VERSION=4.0.3
+        - MAJOR_VERSION=3
+    - os: osx
+      language: generic
+      sudo: required
+      osx_image: xcode9
+      env:
+        - SWIFT_VERSION=4.0.3
+        - MAJOR_VERSION=4
+    - os: osx
+      language: generic
+      sudo: required
+      osx_image: xcode9
+      env:
+        - SWIFT_VERSION=4.0.3
+        - MAJOR_VERSION=3
 install:
 - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
 script:
-- swift test
+- swift test -Xswiftc -swift-version -Xswiftc $MAJOR_VERSION

CHANGELOG.md

@@ -1,5 +1,12 @@
 # PathKit Changelog
 
+## master
+
+### Bug Fixes
+
+* Fix warning with Swift 4, support 4.1
+  [Keith Smiley](https://github.com/keith)
+
 ## 0.9.0
 
 ### Enhancements

Package.swift

@@ -13,5 +13,5 @@ let package = Package(
     .target(name: "PathKit", dependencies: [], path: "Sources"),
     .testTarget(name: "PathKitTests", dependencies: ["PathKit", "Spectre"], path:"Tests/PathKitTests")
   ],
-  swiftLanguageVersions: [3]
+  swiftLanguageVersions: [3, 4]
 )

Sources/PathKit.swift

@@ -42,7 +42,7 @@ public struct Path {
       path = "."
     } else if components.first == Path.separator && components.count > 1 {
       let p = components.joined(separator: Path.separator)
-      path = p.substring(from: p.characters.index(after: p.startIndex))
+      path = String(p[p.index(after: p.startIndex)...])
     } else {
       path = components.joined(separator: Path.separator)
     }
@@ -276,10 +276,10 @@ extension Path {
     guard Path.fileManager.fileExists(atPath: normalize().path, isDirectory: &directory) else {
       return false
     }
-#if os(Linux)
-    return directory
-#else
+#if !os(Linux) || swift(>=4.1)
     return directory.boolValue
+#else
+    return directory
 #endif
   }
 
@@ -295,10 +295,10 @@ extension Path {
     guard Path.fileManager.fileExists(atPath: normalize().path, isDirectory: &directory) else {
       return false
     }
-#if os(Linux)
-  return !directory
-#else
+#if !os(Linux) || swift(>=4.1)
   return !directory.boolValue
+#else
+  return !directory
 #endif
   }
 
@@ -598,13 +598,23 @@ extension Path {
 #else
       let matchc = gt.gl_matchc
 #endif
+#if swift(>=4.1)
+      return (0..<Int(matchc)).compactMap { index in
+        if let path = String(validatingUTF8: gt.gl_pathv[index]!) {
+          return Path(path)
+        }
+
+        return nil
+      }
+#else
       return (0..<Int(matchc)).flatMap { index in
         if let path = String(validatingUTF8: gt.gl_pathv[index]!) {
           return Path(path)
         }
 
         return nil
       }
+#endif
     }
 
     // GLOB_NOMATCH

Tests/PathKitTests/PathKitSpec.swift

@@ -210,10 +210,10 @@ describe("PathKit") {
 
   $0.it("can return the last component without extension") {
     try expect(Path("a/b/c.d").lastComponentWithoutExtension) == "c"
-    #if os(Linux) // no longer necessary after Swift 4.1
-        try expect(Path("a/..").lastComponentWithoutExtension) == "."
-    #else
+    #if !os(Linux) || swift(>=4.1)
         try expect(Path("a/..").lastComponentWithoutExtension) == ".."
+    #else
+        try expect(Path("a/..").lastComponentWithoutExtension) == "."
     #endif
   }