Skip to content

Commit c1dd1e1

Browse files
authored
Merge pull request #13 from Hexaville/swift4
Update files to Swift 4 layout
2 parents ecb6a12 + a61f8af commit c1dd1e1

File tree

5 files changed

+63
-43
lines changed

5 files changed

+63
-43
lines changed

Package.pins

Lines changed: 0 additions & 36 deletions
This file was deleted.

Package.resolved

Lines changed: 52 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
// swift-tools-version:3.1
1+
// swift-tools-version:4.0
22

33
import PackageDescription
44

55
let package = Package(
66
name: "HexavilleAuth",
7-
targets: [
8-
Target(name: "HexavilleAuth"),
9-
Target(name: "HexavilleAuthExample", dependencies: ["HexavilleAuth"])
7+
products: [
8+
.library(name: "HexavilleAuth", targets: ["HexavilleAuth"]),
9+
.executable(name: "hexaville-todo-example", targets: ["HexavilleAuthExample"])
1010
],
1111
dependencies: [
12-
.Package(url: "https://github.com/noppoMan/HexavilleFramework.git", majorVersion: 0, minor: 1)
12+
.package(url: "https://github.com/noppoMan/HexavilleFramework.git", .upToNextMajor(from: "0.1.15"))
13+
],
14+
targets: [
15+
.target(name: "HexavilleAuth", dependencies: ["HexavilleFramework"]),
16+
.target(name: "HexavilleAuthExample", dependencies: ["HexavilleAuth"])
1317
]
1418
)

Sources/HexavilleAuth/HexavilleAuth+Router.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import HexavilleFramework
1111

1212
extension HexavilleAuth {
1313
func asRouter() -> Router {
14-
let router = Router()
14+
var router = Router()
1515
for type in providers {
1616
switch type {
1717
case .oauth1(let provider):

Sources/HexavilleAuthExample/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ app.use(HexavilleAuth.AuthenticationMiddleware())
8787

8888
app.use(auth)
8989

90-
let router = Router()
90+
var router = Router()
9191

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

0 commit comments

Comments
 (0)