Skip to content

Commit

Permalink
vapor 4
Browse files Browse the repository at this point in the history
  • Loading branch information
proggeramlug committed Feb 10, 2020
1 parent 15077b7 commit 302b0f1
Show file tree
Hide file tree
Showing 14 changed files with 186 additions and 625 deletions.
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>JWTMiddleware.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>JWTMiddleware</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>JWTMiddlewareTests</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
202 changes: 65 additions & 137 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2,228 +2,156 @@
"object": {
"pins": [
{
"package": "Auth",
"repositoryURL": "https://github.com/vapor/auth.git",
"package": "async-http-client",
"repositoryURL": "https://github.com/swift-server/async-http-client.git",
"state": {
"branch": null,
"revision": "e6f61b403727ec124214beb3e57deff579f31d00",
"version": "2.0.4"
"revision": "48e284d1ea6d0e8baac1af1c4ad8bd298670caf6",
"version": "1.0.1"
}
},
{
"package": "Console",
"repositoryURL": "https://github.com/vapor/console.git",
"package": "async-kit",
"repositoryURL": "https://github.com/vapor/async-kit.git",
"state": {
"branch": null,
"revision": "d6cf07af59ae63cd95c4b5f98cf1f25627750fd1",
"version": "3.1.0"
"revision": "8e9d41f31848809732661563b334c1bb1c93cf1a",
"version": "1.0.0-beta.2.2"
}
},
{
"package": "Core",
"repositoryURL": "https://github.com/vapor/core.git",
"package": "console-kit",
"repositoryURL": "https://github.com/vapor/console-kit.git",
"state": {
"branch": null,
"revision": "96ce86ebf9198328795c4b9cb711489460be083c",
"version": "3.4.4"
"revision": "54585747b6a5c435b7852c026028710fd7a94bec",
"version": "4.0.0-beta.2.1"
}
},
{
"package": "Crypto",
"repositoryURL": "https://github.com/vapor/crypto.git",
"state": {
"branch": null,
"revision": "5605334590affd4785a5839806b4504407e054ac",
"version": "3.3.0"
}
},
{
"package": "DatabaseKit",
"repositoryURL": "https://github.com/vapor/database-kit.git",
"state": {
"branch": null,
"revision": "3a17dbbe9be5f8c37703e4b7982c1332ad6b00c4",
"version": "1.3.1"
}
},
{
"package": "Fluent",
"repositoryURL": "https://github.com/vapor/fluent.git",
"state": {
"branch": null,
"revision": "00b81a9362549facb8e2ac93b17d2a78599fce3b",
"version": "3.1.2"
}
},
{
"package": "FluentSQLite",
"repositoryURL": "https://github.com/vapor/fluent-sqlite.git",
"state": {
"branch": null,
"revision": "c32f5bda84bf4ea691d19afe183d40044f579e11",
"version": "3.0.0"
}
},
{
"package": "HTTP",
"repositoryURL": "https://github.com/vapor/http.git",
"package": "jwt",
"repositoryURL": "https://github.com/vapor/jwt.git",
"state": {
"branch": null,
"revision": "6973bf50dab8dd00e4daf8cb82ca72b33f5db016",
"version": "3.1.6"
"revision": "9e121e0dc7fa169a60e20f263a09b4eab444180c",
"version": "4.0.0-beta.2"
}
},
{
"package": "JWT",
"repositoryURL": "https://github.com/vapor/jwt.git",
"package": "jwt-kit",
"repositoryURL": "https://github.com/vapor/jwt-kit.git",
"state": {
"branch": null,
"revision": "2e225c722bf26407c1c4bd11d341e48759f46095",
"version": "3.0.0"
"revision": "01c623f7dd82c3d4fd020ce87f19d858449989d3",
"version": "4.0.0-beta.2.2"
}
},
{
"package": "JWTVapor",
"repositoryURL": "https://github.com/skelpo/JWTVapor.git",
"package": "multipart-kit",
"repositoryURL": "https://github.com/vapor/multipart-kit.git",
"state": {
"branch": null,
"revision": "eb5a41d354d694976ec5762ffc6544b0efbe630c",
"version": "0.13.0"
"revision": "b41a49b5756ac3fbf8f2b07228a7e75f9b60731a",
"version": "4.0.0-beta.2"
}
},
{
"package": "Multipart",
"repositoryURL": "https://github.com/vapor/multipart.git",
"package": "open-crypto",
"repositoryURL": "https://github.com/vapor/open-crypto.git",
"state": {
"branch": null,
"revision": "e57007c23a52b68e44ebdfc70cbe882a7c4f1ec3",
"version": "3.0.2"
"revision": "90c49bc68ee6d992fa13cf84ca8fc54b97eaf4cc",
"version": "4.0.0-beta.2"
}
},
{
"package": "Routing",
"repositoryURL": "https://github.com/vapor/routing.git",
"package": "routing-kit",
"repositoryURL": "https://github.com/vapor/routing-kit.git",
"state": {
"branch": null,
"revision": "3219e328491b0853b8554c5a694add344d2c6cfb",
"version": "3.0.1"
"revision": "6a8a1636ad26494b03f3c72d74a420fc3a44949c",
"version": "4.0.0-beta.3"
}
},
{
"package": "Service",
"repositoryURL": "https://github.com/vapor/service.git",
"package": "swift-backtrace",
"repositoryURL": "https://github.com/ianpartridge/swift-backtrace.git",
"state": {
"branch": null,
"revision": "281a70b69783891900be31a9e70051b6fe19e146",
"version": "1.0.0"
"revision": "eaf2cef011c0c23d1701aa60b364def8015dc3c7",
"version": "1.1.1"
}
},
{
"package": "SQL",
"repositoryURL": "https://github.com/vapor/sql.git",
"package": "swift-log",
"repositoryURL": "https://github.com/apple/swift-log.git",
"state": {
"branch": null,
"revision": "839cf96eba296d26151ff1d7a746e9fe35053584",
"version": "2.2.0"
"revision": "74d7b91ceebc85daf387ebb206003f78813f71aa",
"version": "1.2.0"
}
},
{
"package": "SQLite",
"repositoryURL": "https://github.com/vapor/sqlite.git",
"package": "swift-metrics",
"repositoryURL": "https://github.com/apple/swift-metrics.git",
"state": {
"branch": null,
"revision": "314d9cd21165bcf14215e336a23ff8214f40e411",
"version": "3.2.1"
"revision": "3fefedaaef285830cc98ae80231140122076a7e0",
"version": "1.2.0"
}
},
{
"package": "swift-nio",
"repositoryURL": "https://github.com/apple/swift-nio.git",
"state": {
"branch": null,
"revision": "035962e6b6e03c8721a91a9b96dc084289795cb4",
"version": "1.11.0"
}
},
{
"package": "swift-nio-ssl",
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
"state": {
"branch": null,
"revision": "db16c3a90b101bb53b26a58867a344ad428072e0",
"version": "1.3.2"
}
},
{
"package": "swift-nio-ssl-support",
"repositoryURL": "https://github.com/apple/swift-nio-ssl-support.git",
"state": {
"branch": null,
"revision": "c02eec4e0e6d351cd092938cf44195a8e669f555",
"version": "1.0.0"
}
},
{
"package": "swift-nio-zlib-support",
"repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
"state": {
"branch": null,
"revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
"version": "1.0.0"
"revision": "4409b57d4c0c40d41ac2b320fccf02e4d451e3db",
"version": "2.13.0"
}
},
{
"package": "TemplateKit",
"repositoryURL": "https://github.com/vapor/template-kit.git",
"package": "swift-nio-extras",
"repositoryURL": "https://github.com/apple/swift-nio-extras.git",
"state": {
"branch": null,
"revision": "aff2d6fc65bfd04579b0201b31a8d6720239c1cf",
"version": "1.1.1"
"revision": "b4dbfacff47fb8d0f9e0a422d8d37935a9f10570",
"version": "1.4.0"
}
},
{
"package": "URLEncodedForm",
"repositoryURL": "https://github.com/vapor/url-encoded-form.git",
"package": "swift-nio-http2",
"repositoryURL": "https://github.com/apple/swift-nio-http2.git",
"state": {
"branch": null,
"revision": "932024f363ee5ff59059cf7d67194a1c271d3d0c",
"version": "1.0.5"
"revision": "c1bfb7ce3f201e41ff60ef38fa63e67e0eb66a24",
"version": "1.9.0"
}
},
{
"package": "Validation",
"repositoryURL": "https://github.com/vapor/validation.git",
"package": "swift-nio-ssl",
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
"state": {
"branch": null,
"revision": "4de213cf319b694e4ce19e5339592601d4dd3ff6",
"version": "2.1.1"
"revision": "cf54f5c1db1c3740a6c7d662dc8569c150c3846c",
"version": "2.6.0"
}
},
{
"package": "Vapor",
"package": "vapor",
"repositoryURL": "https://github.com/vapor/vapor.git",
"state": {
"branch": null,
"revision": "c86ada59b31c69f08a6abd4f776537cba48d5df6",
"version": "3.3.0"
}
},
{
"package": "VaporRequestStorage",
"repositoryURL": "https://github.com/skelpo/vapor-request-storage.git",
"state": {
"branch": null,
"revision": "8b78db172e07c6d616b85966177f195bed3936b2",
"version": "0.4.0"
"revision": "67165212d2f18b1f9a5df4eb27638e1f88ecbccf",
"version": "4.0.0-beta.3.10"
}
},
{
"package": "WebSocket",
"repositoryURL": "https://github.com/vapor/websocket.git",
"package": "websocket-kit",
"repositoryURL": "https://github.com/vapor/websocket-kit.git",
"state": {
"branch": null,
"revision": "eb4277f75f1d96a3d15c852cdd89af1799093dcd",
"version": "1.1.0"
"revision": "766b4b0005a158550c345671c8e7cea42af104b6",
"version": "2.0.0-beta.2.3"
}
}
]
Expand Down
16 changes: 8 additions & 8 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// swift-tools-version:4.0
// swift-tools-version:5.1

import PackageDescription

let package = Package(
name: "JWTMiddleware",
platforms: [
.macOS(.v10_15)
],
products: [
.library(name: "JWTMiddleware", targets: ["JWTMiddleware", "JWTAuthenticatable"]),
.library(name: "JWTMiddleware", targets: ["JWTMiddleware"]),
],
dependencies: [
.package(url: "https://github.com/skelpo/vapor-request-storage.git", from: "0.4.0"),
.package(url: "https://github.com/skelpo/JWTVapor.git", from: "0.13.0"),
.package(url: "https://github.com/vapor/vapor.git", from: "3.3.0"),
.package(url: "https://github.com/vapor/auth.git", from: "2.0.4")
.package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-beta.3"),
.package(url: "https://github.com/vapor/jwt.git", from: "4.0.0-beta.2"),
],
targets: [
.target(name: "JWTAuthenticatable", dependencies: ["Vapor", "Authentication", "JWTVapor", "VaporRequestStorage"]),
.target(name: "JWTMiddleware", dependencies: ["Vapor", "Authentication", "JWTVapor", "JWTAuthenticatable"]),
.target(name: "JWTMiddleware", dependencies: ["Vapor", "JWT"]),
.testTarget(name: "JWTMiddlewareTests", dependencies: ["JWTMiddleware"])
]
)
Loading

0 comments on commit 302b0f1

Please sign in to comment.