Skip to content

Commit

Permalink
Merge pull request #13 from Hexaville/swift4
Browse files Browse the repository at this point in the history
Update files to Swift 4 layout
  • Loading branch information
noppoMan committed Oct 10, 2017
2 parents ecb6a12 + a61f8af commit c1dd1e1
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 43 deletions.
36 changes: 0 additions & 36 deletions Package.pins

This file was deleted.

52 changes: 52 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"object": {
"pins": [
{
"package": "CHTTPParser",
"repositoryURL": "https://github.com/Zewo/CHTTPParser.git",
"state": {
"branch": null,
"revision": "88306ab33bb316b2eedd39c90f4be8f4ebf65a11",
"version": "0.14.0"
}
},
{
"package": "CLibreSSL",
"repositoryURL": "https://github.com/vapor/clibressl.git",
"state": {
"branch": null,
"revision": "23ddb296981d17a8ee6c7418742a40cad5d2f9d0",
"version": "1.0.0"
}
},
{
"package": "HexavilleFramework",
"repositoryURL": "https://github.com/noppoMan/HexavilleFramework.git",
"state": {
"branch": null,
"revision": "168658d90b7db006ac71ed6d2191f43fb423e744",
"version": "0.1.15"
}
},
{
"package": "Prorsum",
"repositoryURL": "https://github.com/noppoMan/Prorsum.git",
"state": {
"branch": null,
"revision": "6f2558056fb887a84331c5da7d6ac4211bc16187",
"version": "0.1.16"
}
},
{
"package": "SwiftCLI",
"repositoryURL": "https://github.com/jakeheis/SwiftCLI.git",
"state": {
"branch": null,
"revision": "8e5916bfcc7f8acee6fb2cb36d1ffefb02ac2460",
"version": "3.1.0"
}
}
]
},
"version": 1
}
14 changes: 9 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
// swift-tools-version:3.1
// swift-tools-version:4.0

import PackageDescription

let package = Package(
name: "HexavilleAuth",
targets: [
Target(name: "HexavilleAuth"),
Target(name: "HexavilleAuthExample", dependencies: ["HexavilleAuth"])
products: [
.library(name: "HexavilleAuth", targets: ["HexavilleAuth"]),
.executable(name: "hexaville-todo-example", targets: ["HexavilleAuthExample"])
],
dependencies: [
.Package(url: "https://github.com/noppoMan/HexavilleFramework.git", majorVersion: 0, minor: 1)
.package(url: "https://github.com/noppoMan/HexavilleFramework.git", .upToNextMajor(from: "0.1.15"))
],
targets: [
.target(name: "HexavilleAuth", dependencies: ["HexavilleFramework"]),
.target(name: "HexavilleAuthExample", dependencies: ["HexavilleAuth"])
]
)
2 changes: 1 addition & 1 deletion Sources/HexavilleAuth/HexavilleAuth+Router.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import HexavilleFramework

extension HexavilleAuth {
func asRouter() -> Router {
let router = Router()
var router = Router()
for type in providers {
switch type {
case .oauth1(let provider):
Expand Down
2 changes: 1 addition & 1 deletion Sources/HexavilleAuthExample/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ app.use(HexavilleAuth.AuthenticationMiddleware())

app.use(auth)

let router = Router()
var router = Router()

router.use(.get, "/") { req, context in
return Response(body: "Welcome to Hexaville Auth")
Expand Down

0 comments on commit c1dd1e1

Please sign in to comment.