Skip to content

Commit

Permalink
Merge branch 'master' into fix/incorrect-bearer-token-format
Browse files Browse the repository at this point in the history
  • Loading branch information
mihailstumkins authored Oct 24, 2017
2 parents 0cea061 + 67e86ae commit 04c8046
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 13 deletions.
40 changes: 40 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
version: 2

jobs:
macos:
macos:
xcode: "9.0"
steps:
- run: brew install vapor/tap/ctls
- checkout
- run: swift build
- run: swift build -c release
- run: swift test

linux-swift3:
docker:
- image: swift:3.1
steps:
- run: apt-get install -yq libssl-dev
- checkout
- run: swift build
- run: swift build -c release
- run: swift test

linux:
docker:
- image: swift:4.0
steps:
- run: apt-get install -yq libssl-dev
- checkout
- run: swift build
- run: swift build -c release
- run: swift test

workflows:
version: 2
tests:
jobs:
- macos
- linux-swift3
- linux
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
/Packages
/*.xcodeproj
Package.pins
Package.resolved

4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ let package = Package(
// JSON Web Tokens in Swift by @siemensikkema.
.Package(url:"https://github.com/vapor/jwt.git", majorVersion: 2),

// Middleware and conveniences for using Auth in Vapor.
// Middleware and conveniences for using Auth in Vapor.
.Package(url:"https://github.com/vapor/auth-provider.git", majorVersion: 1),

// A web framework and server for Swift that works on macOS and Ubuntu.
// A web framework and server for Swift that works on macOS and Ubuntu.
.Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2)
]
)
23 changes: 23 additions & 0 deletions Package@swift-4.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// swift-tools-version:4.0
import PackageDescription

let package = Package(
name: "JWTProvider",
products: [
.library(name: "JWTProvider", targets: ["JWTProvider"]),
],
dependencies: [
// JSON Web Tokens in Swift by @siemensikkema.
.package(url:"https://github.com/vapor/jwt.git", .upToNextMajor(from: "2.0.0")),

// Middleware and conveniences for using Auth in Vapor.
.package(url:"https://github.com/vapor/auth-provider.git", .upToNextMajor(from: "1.0.0")),

// A web framework and server for Swift that works on macOS and Ubuntu.
.package(url: "https://github.com/vapor/vapor.git", .upToNextMajor(from: "2.2.0"))
],
targets: [
.target(name: "JWTProvider", dependencies: ["JWT", "AuthProvider", "Vapor"]),
.testTarget(name: "JWTProviderTests", dependencies: ["JWTProvider"])
]
)
11 changes: 0 additions & 11 deletions circle.yml

This file was deleted.

0 comments on commit 04c8046

Please sign in to comment.