diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4207acc..09c4651 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/Package.swift b/Package.swift index fd73a38..1924bc8 100644 --- a/Package.swift +++ b/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"), + ]), ] ) diff --git a/README.md b/README.md index 8ae9705..9ee17a7 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,12 @@
-
+
-
+
@@ -11,10 +15,10 @@
-
-
+
+
-
+