From afc1248d7e23f75c5d003984545ee2f92c698979 Mon Sep 17 00:00:00 2001 From: tanner0101 Date: Fri, 28 Feb 2020 18:18:40 -0500 Subject: [PATCH 1/2] rc.1 --- .github/workflows/test.yml | 4 ++-- Package.swift | 11 ++++++++--- README.md | 11 ++++++----- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4207acc1..f0b9cba7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,14 +2,14 @@ name: test on: - pull_request jobs: - xenial: + jwt-kit_xenial: container: image: vapor/swift:5.1-xenial runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - run: swift test --enable-test-discovery --sanitize=thread - bionic: + jwt-kit_bionic: container: image: vapor/swift:5.1-bionic runs-on: ubuntu-latest diff --git a/Package.swift b/Package.swift index f59a21f0..df1848a5 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( @@ -17,7 +17,12 @@ let package = Package( ], targets: [ .target(name: "CJWTKitBoringSSL"), - .target(name: "JWTKit", dependencies: ["CJWTKitBoringSSL", "Crypto"]), - .testTarget(name: "JWTKitTests", dependencies: ["JWTKit"]), + .target(name: "JWTKit", dependencies: [ + .target(name: "CJWTKitBoringSSL"), + .product(name: "Crypto", package: "swift-crypto"), + ]), + .testTarget(name: "JWTKitTests", dependencies: [ + .target(name: "JWTKit"), + ]), ] ) diff --git a/README.md b/README.md index af4a9e59..496e4278 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ JWTKit

- - Documentation + + Documentation Team Chat @@ -11,14 +11,15 @@ MIT License - - Continuous Integration + + Continuous Integration - Swift 5.0 + Swift 5.2

+
**Original author** From 1473c830fc7df8c1980b1c0aef90ba0f129be59c Mon Sep 17 00:00:00 2001 From: tanner0101 Date: Fri, 28 Feb 2020 18:19:11 -0500 Subject: [PATCH 2/2] 5.2 --- .github/workflows/test.yml | 4 ++-- README.md | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f0b9cba7..daf7b81e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,14 +4,14 @@ on: jobs: jwt-kit_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 jwt-kit_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/README.md b/README.md index 496e4278..5abdbd93 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@

- JWTKit + JWTKit