Updated SPM dependencies & Makefile tweak

FeatherCMS · Aug 21, 2020 · 48f896f · 48f896f
1 parent 7201d1f
commit 48f896f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -4,8 +4,7 @@ run:
 	swift run Run serve --port 8080
 
 env:
-	echo '' > .env.development
-	echo 'BASE_URL="http://0.0.0.0:8080"' >> .env.development
+	echo 'BASE_URL="http://0.0.0.0:8080"' > .env.development
 	echo 'BASE_PATH="$(CUR_DIR)/"' >> .env.development
 	#echo 'DB_URL=postgres://myuser:mypass@localhost:5432/mydb' >> .env.development
 

diff --git a/Package.resolved b/Package.resolved
@@ -87,8 +87,8 @@
         "repositoryURL": "https://github.com/vapor/jwt-kit.git",
         "state": {
           "branch": null,
-          "revision": "3e631a209cd25f78ba5b6187c527f6c1d8c66732",
-          "version": "4.0.1"
+          "revision": "50a46ba65fa4e2c1bb3783ec7464b42232a23ee2",
+          "version": "4.1.0"
         }
       },
       {
@@ -222,26 +222,26 @@
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "acf5465b5e7fb9aeda54a34d16fb44c31a399715",
-          "version": "2.20.2"
+          "revision": "cf6f2b1807219643270616e03de697b96c46384c",
+          "version": "2.21.0"
         }
       },
       {
         "package": "swift-nio-extras",
         "repositoryURL": "https://github.com/apple/swift-nio-extras.git",
         "state": {
           "branch": null,
-          "revision": "d525d3bbd1321fa928948065fd9a8dc109d5d45b",
-          "version": "1.6.0"
+          "revision": "0b9eb87b227b37544e5b79090bd69e2156efcd24",
+          "version": "1.6.1"
         }
       },
       {
         "package": "swift-nio-http2",
         "repositoryURL": "https://github.com/apple/swift-nio-http2.git",
         "state": {
           "branch": null,
-          "revision": "e9627350bdb85bde7e0dc69a29799e40961ced72",
-          "version": "1.13.0"
+          "revision": "9f4eff06038a9d1301e939a55a0db935634a2f6e",
+          "version": "1.14.0"
         }
       },
       {
@@ -267,8 +267,8 @@
         "repositoryURL": "https://github.com/vapor/vapor",
         "state": {
           "branch": null,
-          "revision": "c4861a4bf1a254280d402a66d4751d1a150e0ade",
-          "version": "4.27.2"
+          "revision": "d910be46835c4c0c5a432de5012b61bdea4695bb",
+          "version": "4.29.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
         .library(name: "App", targets: ["App"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/vapor", from: "4.27.0"),
+        .package(url: "https://github.com/vapor/vapor", from: "4.29.0"),
         .package(url: "https://github.com/vapor/leaf", from: "4.0.0-rc"),
         .package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
         //.package(url: "https://github.com/vapor/fluent-postgres-driver", from: "2.0.0"),

diff --git a/Tests/AppTests/AppTests.swift b/Tests/AppTests/AppTests.swift
@@ -19,10 +19,10 @@ final class AppTests: XCTestCase {
         defer { app.shutdown() }
         try configure(app)
 
-        try app.test(.GET, "/") { res in
+        try app.test(.GET, "/", afterResponse:  { res in
             XCTAssertEqual(res.status, .ok)
             //XCTAssertEqual(res.body.string, "Hello, world!")
-        }
+        })
         //.test(.POST, "todos", json: Todo(title: "Test My App")) { res in
 //            XCTAssertContent(Todo.self, res) {
 //                XCTAssertNotNil($0.id)