Fix swift SIL exception

stencilproject · Apr 5, 2019 · 3c97368 · 3c97368
1 parent 06ea016
commit 3c97368
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git 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
@@ -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/[email protected] b/[email protected]
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)