Merge pull request #156 from vapor/tn-rc-1

Release Candidate 1

.github/workflows/test.yml

@@ -2,16 +2,16 @@ name: test
 on:
 - pull_request
 jobs:
-  xenial:
+  leaf_xenial:
     container: 
-      image: vapor/swift:5.1-xenial
+      image: vapor/swift:5.2-xenial
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - run: swift test --enable-test-discovery --sanitize=thread
-  bionic:
+  leaf_bionic:
     container: 
-      image: vapor/swift:5.1-bionic
+      image: vapor/swift:5.2-bionic
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.2
 import PackageDescription
 
 let package = Package(
@@ -10,11 +10,17 @@ let package = Package(
         .library(name: "Leaf", targets: ["Leaf"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/leaf-kit.git", from: "1.0.0-beta.2"),
-        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-beta.4"),
+        .package(url: "https://github.com/vapor/leaf-kit.git", from: "1.0.0-rc.1"),
+        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-rc.1"),
     ],
     targets: [
-        .target(name: "Leaf", dependencies: ["LeafKit", "Vapor"]),
-        .testTarget(name: "LeafTests", dependencies: ["Leaf", "XCTVapor"]),
+        .target(name: "Leaf", dependencies: [
+            .product(name: "LeafKit", package: "leaf-kit"),
+            .product(name: "Vapor", package: "vapor"),
+        ]),
+        .testTarget(name: "LeafTests", dependencies: [
+            .target(name: "Leaf"),
+            .product(name: "XCTVapor", package: "vapor"),
+        ]),
     ]
 )

README.md

@@ -1,8 +1,12 @@
 <p align="center">
-    <img src="https://user-images.githubusercontent.com/1342803/36648663-5357293c-1a64-11e8-8ea1-9c2cddcdba39.png" height="64" alt="Leaf">
+    <img 
+        src="https://user-images.githubusercontent.com/1342803/75696046-ee2d5280-5c78-11ea-8201-38f109c3a0eb.png" 
+        height="64" 
+        alt="Leaf"
+    >
     <br>
     <br>
-    <a href="https://docs.vapor.codes/3.0/leaf/getting-started/">
+    <a href="https://docs.vapor.codes/4.0/">
         <img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
     </a>
     <a href="https://discord.gg/vapor">
@@ -11,10 +15,10 @@
     <a href="LICENSE">
         <img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT License">
     </a>
-    <a href="https://circleci.com/gh/vapor/leaf">
-        <img src="https://circleci.com/gh/vapor/leaf.svg?style=shield" alt="Continuous Integration">
+    <a href="https://github.com/vapor/leaf/actions">
+        <img src="https://github.com/vapor/leaf/workflows/test/badge.svg" alt="Continuous Integration">
     </a>
     <a href="https://swift.org">
-        <img src="http://img.shields.io/badge/swift-4.1-brightgreen.svg" alt="Swift 4.1">
+        <img src="http://img.shields.io/badge/swift-5.2-brightgreen.svg" alt="Swift 5.2">
     </a>
 </p>