Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history 
* dev:
  fixed vapor dependency version (#32)
  • Loading branch information
@KazaiMazai
KazaiMazai committed Nov 22, 2021
2 parents 3319723 + 7088b86 commit 8b9f8aa
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 41 deletions.
76 changes: 38 additions & 38 deletions Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,44 @@
"repositoryURL": "https://github.com/swift-server/async-http-client.git",
"state": {
"branch": null,
"revision": "4b4d6605aa2e4f0c2ae3c7563795ae3bec259fff",
"version": "1.2.1"
"revision": "ec2e080d7011a81bd67f10bf41efe6104d7799d6",
"version": "1.7.0"
}
},
{
"package": "async-kit",
"repositoryURL": "https://github.com/vapor/async-kit.git",
"state": {
"branch": null,
"revision": "7457413e57dbfac762b32dd30c1caf2c55a02a3d",
"version": "1.2.0"
"revision": "748c026f4dc93c0b9d05fe43a07d3922ca126744",
"version": "1.10.0"
}
},
{
"package": "console-kit",
"repositoryURL": "https://github.com/vapor/console-kit.git",
"state": {
"branch": null,
"revision": "7454e839bc5ae0e75c3946d2613e442fd342fe6b",
"version": "4.2.4"
"revision": "75ea3b627d88221440b878e5dfccc73fd06842ed",
"version": "4.2.7"
}
},
{
"package": "fluent",
"repositoryURL": "https://github.com/vapor/fluent.git",
"state": {
"branch": null,
"revision": "5810a409eb0271a576f68887fa6713dae3985056",
"version": "4.3.1"
"revision": "ea707ee318066a073c95b2b2df1aa640fcb67f9e",
"version": "4.4.0"
}
},
{
"package": "fluent-kit",
"repositoryURL": "https://github.com/vapor/fluent-kit.git",
"state": {
"branch": null,
"revision": "2eddf6fda3f1ca114f96e0cf82875fefab342343",
"version": "1.13.0"
"revision": "4dc196da17177d0099510c6a3e8b6db0e33466b5",
"version": "1.16.2"
}
},
{
Expand All @@ -60,26 +60,26 @@
"repositoryURL": "https://github.com/vapor/multipart-kit.git",
"state": {
"branch": null,
"revision": "c9ea04017b7fb3b1f034ad7a77f8e53d3e080be5",
"version": "4.2.1"
"revision": "2dd9368a3c9580792b77c7ef364f3735909d9996",
"version": "4.5.1"
}
},
{
"package": "routing-kit",
"repositoryURL": "https://github.com/vapor/routing-kit.git",
"state": {
"branch": null,
"revision": "4cf052b78aebaf1b23f2264ce04d57b4b6eb5254",
"version": "4.2.0"
"revision": "a0801a36a6ad501d5ad6285cbcd4774de6b0a734",
"version": "4.3.0"
}
},
{
"package": "sql-kit",
"repositoryURL": "https://github.com/vapor/sql-kit.git",
"state": {
"branch": null,
"revision": "ea9928b7f4a801b175a00b982034d9c54ecb6167",
"version": "3.7.0"
"revision": "dff8aba9973f2edd7ddb1d29d8d6994a516cf3c1",
"version": "3.13.0"
}
},
{
Expand All @@ -105,98 +105,98 @@
"repositoryURL": "https://github.com/swift-server/swift-backtrace.git",
"state": {
"branch": null,
"revision": "f2fd8c4845a123419c348e0bc4b3839c414077d5",
"version": "1.2.0"
"revision": "d3e04a9d4b3833363fb6192065b763310b156d54",
"version": "1.3.1"
}
},
{
"package": "swift-crypto",
"repositoryURL": "https://github.com/apple/swift-crypto.git",
"state": {
"branch": null,
"revision": "9680b7251cd2be22caaed8f1468bd9e8915a62fb",
"version": "1.1.2"
"revision": "9b5ef28601a9c745c9cdb54d3f243e28ac830982",
"version": "2.0.1"
}
},
{
"package": "swift-log",
"repositoryURL": "https://github.com/apple/swift-log.git",
"state": {
"branch": null,
"revision": "173f567a2dfec11d74588eea82cecea555bdc0bc",
"version": "1.4.0"
"revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
"version": "1.4.2"
}
},
{
"package": "swift-metrics",
"repositoryURL": "https://github.com/apple/swift-metrics.git",
"state": {
"branch": null,
"revision": "f5ed78cb26019b2b85b016f8aa5b1a3427c8251a",
"version": "2.1.0"
"revision": "3edd2f57afc4e68e23c3e4956bc8b65ca6b5b2ff",
"version": "2.2.0"
}
},
{
"package": "swift-nio",
"repositoryURL": "https://github.com/apple/swift-nio.git",
"state": {
"branch": null,
"revision": "c3e2359c55cd8b47207ab7363b77c9c398a95294",
"version": "2.23.0"
"revision": "addf69cfe60376c325397c8926589415576b1dd1",
"version": "2.34.0"
}
},
{
"package": "swift-nio-extras",
"repositoryURL": "https://github.com/apple/swift-nio-extras.git",
"state": {
"branch": null,
"revision": "e5b5d191a80667a14827bfeb0ae4a511f7677942",
"version": "1.7.0"
"revision": "f73ca5ee9c6806800243f1ac415fcf82de9a4c91",
"version": "1.10.2"
}
},
{
"package": "swift-nio-http2",
"repositoryURL": "https://github.com/apple/swift-nio-http2.git",
"state": {
"branch": null,
"revision": "78ddbdfca10f64e4399da37c63372fd8db232152",
"version": "1.15.0"
"revision": "326f7f9a8c8c8402e3691adac04911cac9f9d87f",
"version": "1.18.4"
}
},
{
"package": "swift-nio-ssl",
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
"state": {
"branch": null,
"revision": "eb102ad32add8638410e37a69bc815ea11379813",
"version": "2.10.0"
"revision": "36f6419f2b1b6490a8c0faa840298e28027cefe9",
"version": "2.16.3"
}
},
{
"package": "swift-nio-transport-services",
"repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
"state": {
"branch": null,
"revision": "bb56586c4cab9a79dce6ec4738baddb5802c5de7",
"version": "1.9.0"
"revision": "e7f5278a26442dc46783ba7e063643d524e414a0",
"version": "1.11.3"
}
},
{
"package": "vapor",
"repositoryURL": "https://github.com/vapor/vapor.git",
"state": {
"branch": null,
"revision": "2ada54b7ce56cc6934cd2c0207bef2305bfbd7a1",
"version": "4.48.2"
"revision": "6a5a3b5244d39e2614382c77ddf62e63b712ad06",
"version": "4.53.0"
}
},
{
"package": "websocket-kit",
"repositoryURL": "https://github.com/vapor/websocket-kit.git",
"state": {
"branch": null,
"revision": "2b06a70dfcfa76a2e5079f60e3ae911511f09db0",
"version": "2.1.2"
"revision": "b1c4df8f6c848c2e977726903bbe6578eed723ad",
"version": "2.2.0"
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/vapor/vapor.git", from: "4.48.2"),
.package(url: "https://github.com/vapor/fluent.git", from: "4.3.1"),
.package(url: "https://github.com/vapor/fluent-sqlite-driver.git", from: "4.1.0")
.package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
.package(url: "https://github.com/vapor/fluent.git", from: "4.0.0"),
.package(url: "https://github.com/vapor/fluent-sqlite-driver.git", from: "4.0.0")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down

0 comments on commit 8b9f8aa

Please sign in to comment.