From 3c973689a474993d7275a1548ed36305e5521fca Mon Sep 17 00:00:00 2001 From: kawoou Date: Fri, 5 Apr 2019 13:36:03 +0900 Subject: [PATCH] Fix swift SIL exception --- .travis.yml | 2 +- Package.resolved | 4 ++-- Package@swift-5.swift | 2 +- Tests/StencilTests/EnvironmentSpec.swift | 6 ++++-- Tests/StencilTests/IncludeSpec.swift | 5 ++++- Tests/StencilTests/InheritanceSpec.swift | 5 ++++- Tests/StencilTests/LexerSpec.swift | 3 ++- Tests/StencilTests/LoaderSpec.swift | 3 ++- 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 415935d..cbfc5fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - os: linux env: SWIFT_VERSION=4.2.3 - os: linux - env: SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-03-10-a + env: SWIFT_VERSION=5.0 language: generic sudo: required dist: trusty diff --git a/Package.resolved b/Package.resolved index ff6830b..21b168b 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/kylef/PathKit.git", "state": { "branch": null, - "revision": "e2f5be30e4c8f531c9c1e8765aa7b71c0a45d7a0", - "version": "0.9.2" + "revision": "73f8e9dca9b7a3078cb79128217dc8f2e585a511", + "version": "1.0.0" } }, { diff --git a/Package@swift-5.swift b/Package@swift-5.swift index 9784a37..43b97ee 100644 --- a/Package@swift-5.swift +++ b/Package@swift-5.swift @@ -7,7 +7,7 @@ let package = Package( .library(name: "Stencil", targets: ["Stencil"]) ], dependencies: [ - .package(url: "https://github.com/kylef/PathKit.git", from: "0.9.0"), + .package(url: "https://github.com/kylef/PathKit.git", from: "1.0.0"), .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0") ], targets: [ diff --git a/Tests/StencilTests/EnvironmentSpec.swift b/Tests/StencilTests/EnvironmentSpec.swift index f1bf469..6d8affe 100644 --- a/Tests/StencilTests/EnvironmentSpec.swift +++ b/Tests/StencilTests/EnvironmentSpec.swift @@ -215,7 +215,8 @@ final class EnvironmentIncludeTemplateTests: XCTestCase { override func setUp() { super.setUp() - let path = Path(#file) + ".." + "fixtures" + let basePath: String = #file + let path = Path(basePath) + ".." + "fixtures" let loader = FileSystemLoader(paths: [path]) environment = Environment(loader: loader) template = "" @@ -291,7 +292,8 @@ final class EnvironmentBaseAndChildTemplateTests: XCTestCase { override func setUp() { super.setUp() - let path = Path(#file) + ".." + "fixtures" + let basePath: String = #file + let path = Path(basePath) + ".." + "fixtures" let loader = FileSystemLoader(paths: [path]) environment = Environment(loader: loader) childTemplate = "" diff --git a/Tests/StencilTests/IncludeSpec.swift b/Tests/StencilTests/IncludeSpec.swift index d7d1ddf..1b1493f 100644 --- a/Tests/StencilTests/IncludeSpec.swift +++ b/Tests/StencilTests/IncludeSpec.swift @@ -4,7 +4,10 @@ import Spectre import XCTest final class IncludeTests: XCTestCase { - let path = Path(#file) + ".." + "fixtures" + let path: Path = { + let basePath: String = #file + return Path(basePath) + ".." + "fixtures" + }() lazy var loader = FileSystemLoader(paths: [path]) lazy var environment = Environment(loader: loader) diff --git a/Tests/StencilTests/InheritanceSpec.swift b/Tests/StencilTests/InheritanceSpec.swift index c71736a..da716c3 100644 --- a/Tests/StencilTests/InheritanceSpec.swift +++ b/Tests/StencilTests/InheritanceSpec.swift @@ -4,7 +4,10 @@ import Stencil import XCTest final class InheritanceTests: XCTestCase { - let path = Path(#file) + ".." + "fixtures" + let path: Path = { + let basePath: String = #file + return Path(basePath) + ".." + "fixtures" + }() lazy var loader = FileSystemLoader(paths: [path]) lazy var environment = Environment(loader: loader) diff --git a/Tests/StencilTests/LexerSpec.swift b/Tests/StencilTests/LexerSpec.swift index 9a5e880..483be51 100644 --- a/Tests/StencilTests/LexerSpec.swift +++ b/Tests/StencilTests/LexerSpec.swift @@ -117,7 +117,8 @@ final class LexerTests: XCTestCase { } func testPerformance() throws { - let path = Path(#file) + ".." + "fixtures" + "huge.html" + let basePath: String = #file + let path = Path(basePath) + ".." + "fixtures" + "huge.html" let content: String = try path.read() measure { diff --git a/Tests/StencilTests/LoaderSpec.swift b/Tests/StencilTests/LoaderSpec.swift index 00a1f43..b3dc79a 100644 --- a/Tests/StencilTests/LoaderSpec.swift +++ b/Tests/StencilTests/LoaderSpec.swift @@ -5,7 +5,8 @@ import XCTest final class TemplateLoaderTests: XCTestCase { func testFileSystemLoader() { - let path = Path(#file) + ".." + "fixtures" + let basePath: String = #file + let path = Path(basePath) + ".." + "fixtures" let loader = FileSystemLoader(paths: [path]) let environment = Environment(loader: loader)