From e300cd40882aeaeebfc71b4c1fb8852130a4a73b Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Wed, 27 Mar 2019 15:59:31 +0000 Subject: [PATCH 1/2] chore: test with Swift 5 on all platforms --- .travis.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3993b8f..e07a5a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,16 @@ matrix: - SWIFT_VERSION=4.2 - MAJOR_VERSION=4.2 install: - - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)" + - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" + - os: linux + language: generic + sudo: required + dist: trusty + env: + - SWIFT_VERSION=5.0 + - MAJOR_VERSION=5 + install: + - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" - os: osx language: generic sudo: required @@ -28,7 +37,7 @@ matrix: sudo: required osx_image: xcode10.2 env: - - SWIFT_VERSION=swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-10-a + - SWIFT_VERSION=5.0 - MAJOR_VERSION=5 script: - swift test -Xswiftc -swift-version -Xswiftc $MAJOR_VERSION From 9e0a13c71d0aecd595e79be613ed4e68ff2559d1 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Thu, 28 Mar 2019 08:32:00 -0700 Subject: [PATCH 2/2] Add Swift 5 workaround --- Tests/PathKitTests/PathKitSpec.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tests/PathKitTests/PathKitSpec.swift b/Tests/PathKitTests/PathKitSpec.swift index ad63e9d..e683d99 100644 --- a/Tests/PathKitTests/PathKitSpec.swift +++ b/Tests/PathKitTests/PathKitSpec.swift @@ -9,10 +9,11 @@ func == (lhs:ThrowError, rhs:ThrowError) -> Bool { return true } public func testPathKit() { describe("PathKit") { - let fixtures = Path(#file).parent() + "Fixtures" + let filePath = #file + let fixtures = Path(filePath).parent() + "Fixtures" $0.before { - Path.current = Path(#file).parent() + Path.current = Path(filePath).parent() } $0.it("provides the system separator") {