Skip to content

Commit

Permalink
Merge pull request #10 from twof/4
Browse files Browse the repository at this point in the history
4
  • Loading branch information
twof authored Nov 27, 2021
2 parents aff3233 + bf7509b commit e9e12d9
Show file tree
Hide file tree
Showing 47 changed files with 2,331 additions and 1,041 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
/.build
/Packages
/*.xcodeproj
Package.resolved
.swiftpm/
175 changes: 92 additions & 83 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2,192 +2,201 @@
"object": {
"pins": [
{
"package": "Console",
"repositoryURL": "https://github.com/vapor/console.git",
"package": "async-http-client",
"repositoryURL": "https://github.com/swift-server/async-http-client.git",
"state": {
"branch": null,
"revision": "5b9796d39f201b3dd06800437abd9d774a455e57",
"version": "3.0.2"
"revision": "ec2e080d7011a81bd67f10bf41efe6104d7799d6",
"version": "1.7.0"
}
},
{
"package": "Core",
"repositoryURL": "https://github.com/vapor/core.git",
"package": "async-kit",
"repositoryURL": "https://github.com/vapor/async-kit.git",
"state": {
"branch": null,
"revision": "96ce86ebf9198328795c4b9cb711489460be083c",
"version": "3.4.4"
"revision": "748c026f4dc93c0b9d05fe43a07d3922ca126744",
"version": "1.10.0"
}
},
{
"package": "Crypto",
"repositoryURL": "https://github.com/vapor/crypto.git",
"package": "console-kit",
"repositoryURL": "https://github.com/vapor/console-kit.git",
"state": {
"branch": null,
"revision": "5605334590affd4785a5839806b4504407e054ac",
"version": "3.3.0"
"revision": "75ea3b627d88221440b878e5dfccc73fd06842ed",
"version": "4.2.7"
}
},
{
"package": "DatabaseKit",
"repositoryURL": "https://github.com/vapor/database-kit.git",
"package": "fluent",
"repositoryURL": "https://github.com/vapor/fluent.git",
"state": {
"branch": null,
"revision": "3a17dbbe9be5f8c37703e4b7982c1332ad6b00c4",
"version": "1.3.1"
"revision": "ea707ee318066a073c95b2b2df1aa640fcb67f9e",
"version": "4.4.0"
}
},
{
"package": "Fluent",
"repositoryURL": "https://github.com/vapor/fluent.git",
"package": "fluent-kit",
"repositoryURL": "https://github.com/vapor/fluent-kit.git",
"state": {
"branch": null,
"revision": "dc258fe53880f80508df317df3c903ee2c2b9317",
"version": "3.1.0"
"revision": "4dc196da17177d0099510c6a3e8b6db0e33466b5",
"version": "1.16.2"
}
},
{
"package": "FluentSQLite",
"repositoryURL": "https://github.com/vapor/fluent-sqlite.git",
"package": "fluent-sqlite-driver",
"repositoryURL": "https://github.com/vapor/fluent-sqlite-driver.git",
"state": {
"branch": null,
"revision": "c32f5bda84bf4ea691d19afe183d40044f579e11",
"version": "3.0.0"
"revision": "9ca34be792979fb0f1dbd8e45b8af9f1e1440474",
"version": "4.1.0"
}
},
{
"package": "HTTP",
"repositoryURL": "https://github.com/vapor/http.git",
"package": "multipart-kit",
"repositoryURL": "https://github.com/vapor/multipart-kit.git",
"state": {
"branch": null,
"revision": "272b22be8cb3364e42a4701c2e0676e37480ec5a",
"version": "3.1.5"
"revision": "2dd9368a3c9580792b77c7ef364f3735909d9996",
"version": "4.5.1"
}
},
{
"package": "Multipart",
"repositoryURL": "https://github.com/vapor/multipart.git",
"package": "routing-kit",
"repositoryURL": "https://github.com/vapor/routing-kit.git",
"state": {
"branch": null,
"revision": "e57007c23a52b68e44ebdfc70cbe882a7c4f1ec3",
"version": "3.0.2"
"revision": "a0801a36a6ad501d5ad6285cbcd4774de6b0a734",
"version": "4.3.0"
}
},
{
"package": "Routing",
"repositoryURL": "https://github.com/vapor/routing.git",
"package": "sql-kit",
"repositoryURL": "https://github.com/vapor/sql-kit.git",
"state": {
"branch": null,
"revision": "3219e328491b0853b8554c5a694add344d2c6cfb",
"version": "3.0.1"
"revision": "dff8aba9973f2edd7ddb1d29d8d6994a516cf3c1",
"version": "3.13.0"
}
},
{
"package": "Service",
"repositoryURL": "https://github.com/vapor/service.git",
"package": "sqlite-kit",
"repositoryURL": "https://github.com/vapor/sqlite-kit.git",
"state": {
"branch": null,
"revision": "281a70b69783891900be31a9e70051b6fe19e146",
"version": "1.0.0"
"revision": "2ec279b9c845cec254646834b66338551a024561",
"version": "4.0.2"
}
},
{
"package": "SQL",
"repositoryURL": "https://github.com/vapor/sql.git",
"package": "sqlite-nio",
"repositoryURL": "https://github.com/vapor/sqlite-nio.git",
"state": {
"branch": null,
"revision": "a35cf1dced4ddd32bb2dc8b6e765aea7bcf8d6e0",
"version": "2.1.0"
"revision": "6481dd0b01112d082dd7eb362782126e81964138",
"version": "1.1.0"
}
},
{
"package": "SQLite",
"repositoryURL": "https://github.com/vapor/sqlite.git",
"package": "swift-backtrace",
"repositoryURL": "https://github.com/swift-server/swift-backtrace.git",
"state": {
"branch": null,
"revision": "ad2e9bc9f0ed00ef2c6a05f89c1cec605467c90f",
"version": "3.1.0"
"revision": "d3e04a9d4b3833363fb6192065b763310b156d54",
"version": "1.3.1"
}
},
{
"package": "swift-nio",
"repositoryURL": "https://github.com/apple/swift-nio.git",
"package": "swift-crypto",
"repositoryURL": "https://github.com/apple/swift-crypto.git",
"state": {
"branch": null,
"revision": "5d8148c8b45dfb449276557f22120694567dd1d2",
"version": "1.9.5"
"revision": "9b5ef28601a9c745c9cdb54d3f243e28ac830982",
"version": "2.0.1"
}
},
{
"package": "swift-nio-ssl",
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
"package": "swift-log",
"repositoryURL": "https://github.com/apple/swift-log.git",
"state": {
"branch": null,
"revision": "8380fa29a2af784b067d8ee01c956626ca29f172",
"version": "1.3.1"
"revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
"version": "1.4.2"
}
},
{
"package": "swift-nio-ssl-support",
"repositoryURL": "https://github.com/apple/swift-nio-ssl-support.git",
"package": "swift-metrics",
"repositoryURL": "https://github.com/apple/swift-metrics.git",
"state": {
"branch": null,
"revision": "c02eec4e0e6d351cd092938cf44195a8e669f555",
"version": "1.0.0"
"revision": "3edd2f57afc4e68e23c3e4956bc8b65ca6b5b2ff",
"version": "2.2.0"
}
},
{
"package": "swift-nio-zlib-support",
"repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
"package": "swift-nio",
"repositoryURL": "https://github.com/apple/swift-nio.git",
"state": {
"branch": null,
"revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
"version": "1.0.0"
"revision": "addf69cfe60376c325397c8926589415576b1dd1",
"version": "2.34.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": "db35b1c35aabd0f5db3abca0cfda7becfe9c43e2",
"version": "1.1.0"
"revision": "f73ca5ee9c6806800243f1ac415fcf82de9a4c91",
"version": "1.10.2"
}
},
{
"package": "swift-nio-http2",
"repositoryURL": "https://github.com/apple/swift-nio-http2.git",
"state": {
"branch": null,
"revision": "326f7f9a8c8c8402e3691adac04911cac9f9d87f",
"version": "1.18.4"
}
},
{
"package": "URLEncodedForm",
"repositoryURL": "https://github.com/vapor/url-encoded-form.git",
"package": "swift-nio-ssl",
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
"state": {
"branch": null,
"revision": "932024f363ee5ff59059cf7d67194a1c271d3d0c",
"version": "1.0.5"
"revision": "36f6419f2b1b6490a8c0faa840298e28027cefe9",
"version": "2.16.3"
}
},
{
"package": "Validation",
"repositoryURL": "https://github.com/vapor/validation.git",
"package": "swift-nio-transport-services",
"repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
"state": {
"branch": null,
"revision": "156f8adeac3440e868da3757777884efbc6ec0cc",
"version": "2.1.0"
"revision": "e7f5278a26442dc46783ba7e063643d524e414a0",
"version": "1.11.3"
}
},
{
"package": "Vapor",
"package": "vapor",
"repositoryURL": "https://github.com/vapor/vapor.git",
"state": {
"branch": null,
"revision": "157d3b15336caa882662cc75024dd04b2e225246",
"version": "3.1.0"
"revision": "6a5a3b5244d39e2614382c77ddf62e63b712ad06",
"version": "4.53.0"
}
},
{
"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": "b1c4df8f6c848c2e977726903bbe6578eed723ad",
"version": "2.2.0"
}
}
]
Expand Down
40 changes: 18 additions & 22 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
// swift-tools-version:4.2
// The swift-tools-version declares the minimum version of Swift required to build this package.

// swift-tools-version:5.5
import PackageDescription

let package = Package(
name: "CrudRouter",
platforms: [
.macOS(.v12)
],
products: [
// Products define the executables and libraries produced by a package, and make them visible to other packages.
.library(
name: "CrudRouter",
targets: ["CrudRouter"]),
.library(name: "CrudRouter", targets: ["CrudRouter"]),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
// 💧 A server-side Swift web framework.,
.package(url: "https://github.com/vapor/vapor.git", .upToNextMajor(from: "3.0.0")),

// 🔵 Swift ORM (queries, models, relations, etc) built on SQLite 3.
.package(url: "https://github.com/vapor/fluent-sqlite.git", .upToNextMajor(from: "3.0.0")),
.package(url: "https://github.com/vapor/vapor.git", from: "4.53.0"),
.package(url: "https://github.com/vapor/fluent.git", from: "4.4.0"),
.package(url: "https://github.com/vapor/fluent-sqlite-driver.git", from: "4.1.0"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
.target(
name: "CrudRouter",
dependencies: ["FluentSQLite", "Vapor"]),
.testTarget(
name: "CrudRouterTests",
dependencies: ["CrudRouter", "FluentSQLite"]),
.target(name: "CrudRouter", dependencies: [
.product(name: "Vapor", package: "vapor"),
.product(name: "Fluent", package: "fluent"),
.product(name: "FluentSQLiteDriver", package: "fluent-sqlite-driver")
]),
.testTarget(name: "CrudRouterIntegrationTests", dependencies: [
.target(name: "CrudRouter"),
.product(name: "FluentSQLiteDriver", package: "fluent-sqlite-driver"),
.product(name: "XCTVapor", package: "vapor")
]),
]
)
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ GET /todo/:id/tag/:id
### Future features
- query parameter support
- PATCH support
- more fine grained response statuses
- automatically expose relations (blocked by lack of Swift reflection support)
- documentation for all public functions
- generate models and rest routes via console command
Expand Down
Loading

0 comments on commit e9e12d9

Please sign in to comment.