Skip to content

Commit aa29b91

Browse files
tibtib
committed
Vapor 4.14 support
- fixed migration issues - fixed memory issues - xcodeproj file for iOS projects - removed unnecessary markers //... - dependency version bumps
1 parent 9055a0b commit aa29b91

File tree

134 files changed

+3644
-1645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+3644
-1645
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.build
33
.swiftpm
44
xcuserdata
5-
*.xcodeproj
5+
MyProject.xcodeproj
66
Packages
77
DerivedData/
88
db.sqlite

‎Chapter 02/SPM/Package.resolved

+133
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
{
2+
"object": {
3+
"pins": [
4+
{
5+
"package": "async-http-client",
6+
"repositoryURL": "https://github.com/swift-server/async-http-client.git",
7+
"state": {
8+
"branch": null,
9+
"revision": "037b70291941fe43de668066eb6fb802c5e181d2",
10+
"version": "1.1.1"
11+
}
12+
},
13+
{
14+
"package": "async-kit",
15+
"repositoryURL": "https://github.com/vapor/async-kit.git",
16+
"state": {
17+
"branch": null,
18+
"revision": "8e2cad80dd9f62f0349a2a78ab8c81fb456f4d4a",
19+
"version": "1.1.1"
20+
}
21+
},
22+
{
23+
"package": "console-kit",
24+
"repositoryURL": "https://github.com/vapor/console-kit.git",
25+
"state": {
26+
"branch": null,
27+
"revision": "05c52a91631a6ca432275439f6456a5dace0d1db",
28+
"version": "4.1.2"
29+
}
30+
},
31+
{
32+
"package": "routing-kit",
33+
"repositoryURL": "https://github.com/vapor/routing-kit.git",
34+
"state": {
35+
"branch": null,
36+
"revision": "e7f2d5bd36dc65a9edb303541cb678515a7fece3",
37+
"version": "4.1.0"
38+
}
39+
},
40+
{
41+
"package": "swift-backtrace",
42+
"repositoryURL": "https://github.com/swift-server/swift-backtrace.git",
43+
"state": {
44+
"branch": null,
45+
"revision": "f2fd8c4845a123419c348e0bc4b3839c414077d5",
46+
"version": "1.2.0"
47+
}
48+
},
49+
{
50+
"package": "swift-crypto",
51+
"repositoryURL": "https://github.com/apple/swift-crypto.git",
52+
"state": {
53+
"branch": null,
54+
"revision": "9b9d1868601a199334da5d14f4ab2d37d4f8d0c5",
55+
"version": "1.0.2"
56+
}
57+
},
58+
{
59+
"package": "swift-log",
60+
"repositoryURL": "https://github.com/apple/swift-log.git",
61+
"state": {
62+
"branch": null,
63+
"revision": "74d7b91ceebc85daf387ebb206003f78813f71aa",
64+
"version": "1.2.0"
65+
}
66+
},
67+
{
68+
"package": "swift-metrics",
69+
"repositoryURL": "https://github.com/apple/swift-metrics.git",
70+
"state": {
71+
"branch": null,
72+
"revision": "708b960b4605abb20bc55d65abf6bad607252200",
73+
"version": "2.0.0"
74+
}
75+
},
76+
{
77+
"package": "swift-nio",
78+
"repositoryURL": "https://github.com/apple/swift-nio.git",
79+
"state": {
80+
"branch": null,
81+
"revision": "120acb15c39aa3217e9888e515de160378fbcc1e",
82+
"version": "2.18.0"
83+
}
84+
},
85+
{
86+
"package": "swift-nio-extras",
87+
"repositoryURL": "https://github.com/apple/swift-nio-extras.git",
88+
"state": {
89+
"branch": null,
90+
"revision": "7cd24c0efcf9700033f671b6a8eaa64a77dd0b72",
91+
"version": "1.5.1"
92+
}
93+
},
94+
{
95+
"package": "swift-nio-http2",
96+
"repositoryURL": "https://github.com/apple/swift-nio-http2.git",
97+
"state": {
98+
"branch": null,
99+
"revision": "c5d10f4165128c3d0cc0e3c0f0a8ef55947a73a6",
100+
"version": "1.12.2"
101+
}
102+
},
103+
{
104+
"package": "swift-nio-ssl",
105+
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
106+
"state": {
107+
"branch": null,
108+
"revision": "f0b118d9af6c4e78bc4f3f4fbb464020172b0bf4",
109+
"version": "2.7.5"
110+
}
111+
},
112+
{
113+
"package": "vapor",
114+
"repositoryURL": "https://github.com/vapor/vapor.git",
115+
"state": {
116+
"branch": null,
117+
"revision": "dc2aa1e02e04a47b67cb0dabed628fe844900f30",
118+
"version": "4.14.0"
119+
}
120+
},
121+
{
122+
"package": "websocket-kit",
123+
"repositoryURL": "https://github.com/vapor/websocket-kit.git",
124+
"state": {
125+
"branch": null,
126+
"revision": "021edd1ca55451ad15b3e84da6b4064e4b877b34",
127+
"version": "2.1.0"
128+
}
129+
}
130+
]
131+
},
132+
"version": 1
133+
}

‎Chapter 02/SPM/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
.executable(name: "myProject", targets: ["myProject"]),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/vapor/vapor.git", from: "4.5.0"),
13+
.package(url: "https://github.com/vapor/vapor.git", from: "4.14.0"),
1414
],
1515
targets: [
1616
.target(name: "myProject", dependencies: [

‎Chapter 02/VaporToolbox/Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@
114114
"repositoryURL": "https://github.com/vapor/vapor.git",
115115
"state": {
116116
"branch": null,
117-
"revision": "c70d45fe9cce525df5b5f4793a232596cd85484b",
118-
"version": "4.5.0"
117+
"revision": "dc2aa1e02e04a47b67cb0dabed628fe844900f30",
118+
"version": "4.14.0"
119119
}
120120
},
121121
{

‎Chapter 02/VaporToolbox/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let package = Package(
88
],
99
dependencies: [
1010
// 💧 A server-side Swift web framework.
11-
.package(url: "https://github.com/vapor/vapor.git", from: "4.5.0")
11+
.package(url: "https://github.com/vapor/vapor.git", from: "4.14.0")
1212
],
1313
targets: [
1414
.target(name: "App", dependencies: [

‎Chapter 03/myProject/Package.resolved

+24-24
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,44 @@
1515
"repositoryURL": "https://github.com/vapor/async-kit.git",
1616
"state": {
1717
"branch": null,
18-
"revision": "48a719dec79ea3cbbc71ca9b29f69df7cd5794cd",
19-
"version": "1.0.1"
18+
"revision": "8e2cad80dd9f62f0349a2a78ab8c81fb456f4d4a",
19+
"version": "1.1.1"
2020
}
2121
},
2222
{
2323
"package": "console-kit",
2424
"repositoryURL": "https://github.com/vapor/console-kit.git",
2525
"state": {
2626
"branch": null,
27-
"revision": "7a97a5ea7fefe61cf2c943242113125b0f396a98",
28-
"version": "4.1.0"
27+
"revision": "4ffc23dd1d6454228f78194ef68d8b20fca9390a",
28+
"version": "4.1.1"
2929
}
3030
},
3131
{
3232
"package": "leaf",
3333
"repositoryURL": "https://github.com/vapor/leaf.git",
3434
"state": {
3535
"branch": null,
36-
"revision": "409ad1c610c503335d2033062199c3c2778bffd9",
37-
"version": "4.0.0-rc.1.2"
36+
"revision": "7f5f878ccf9ec75ee1bfadf5eb9624ae6b9f8534",
37+
"version": "4.0.0-rc.1.3"
3838
}
3939
},
4040
{
4141
"package": "leaf-kit",
4242
"repositoryURL": "https://github.com/vapor/leaf-kit.git",
4343
"state": {
4444
"branch": null,
45-
"revision": "b6c8edd71a5387c4b48ecafe5be4cadd4f896193",
46-
"version": "1.0.0-rc.1.4"
45+
"revision": "27724d049e959bef6bfbf71be33b446fccfd5e3f",
46+
"version": "1.0.0-rc.1.13"
4747
}
4848
},
4949
{
5050
"package": "routing-kit",
5151
"repositoryURL": "https://github.com/vapor/routing-kit.git",
5252
"state": {
5353
"branch": null,
54-
"revision": "35da702471cbcc308f58d38aa8fea971fa3fb166",
55-
"version": "4.0.0"
54+
"revision": "e7f2d5bd36dc65a9edb303541cb678515a7fece3",
55+
"version": "4.1.0"
5656
}
5757
},
5858
{
@@ -69,8 +69,8 @@
6969
"repositoryURL": "https://github.com/apple/swift-crypto.git",
7070
"state": {
7171
"branch": null,
72-
"revision": "d67ac68d09a95443303e9d6e37b34e7ba101d5f1",
73-
"version": "1.0.1"
72+
"revision": "9b9d1868601a199334da5d14f4ab2d37d4f8d0c5",
73+
"version": "1.0.2"
7474
}
7575
},
7676
{
@@ -96,53 +96,53 @@
9696
"repositoryURL": "https://github.com/apple/swift-nio.git",
9797
"state": {
9898
"branch": null,
99-
"revision": "e876fb37410e0036b98b5361bb18e6854739572b",
100-
"version": "2.16.0"
99+
"revision": "120acb15c39aa3217e9888e515de160378fbcc1e",
100+
"version": "2.18.0"
101101
}
102102
},
103103
{
104104
"package": "swift-nio-extras",
105105
"repositoryURL": "https://github.com/apple/swift-nio-extras.git",
106106
"state": {
107107
"branch": null,
108-
"revision": "b4dbfacff47fb8d0f9e0a422d8d37935a9f10570",
109-
"version": "1.4.0"
108+
"revision": "7cd24c0efcf9700033f671b6a8eaa64a77dd0b72",
109+
"version": "1.5.1"
110110
}
111111
},
112112
{
113113
"package": "swift-nio-http2",
114114
"repositoryURL": "https://github.com/apple/swift-nio-http2.git",
115115
"state": {
116116
"branch": null,
117-
"revision": "82eb3fa0974b838358ee46bc6c5381e5ae5de6b9",
118-
"version": "1.11.0"
117+
"revision": "c5d10f4165128c3d0cc0e3c0f0a8ef55947a73a6",
118+
"version": "1.12.2"
119119
}
120120
},
121121
{
122122
"package": "swift-nio-ssl",
123123
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
124124
"state": {
125125
"branch": null,
126-
"revision": "ae213938e151964aa691f0e902462fbe06baeeb6",
127-
"version": "2.7.1"
126+
"revision": "f0b118d9af6c4e78bc4f3f4fbb464020172b0bf4",
127+
"version": "2.7.5"
128128
}
129129
},
130130
{
131131
"package": "vapor",
132132
"repositoryURL": "https://github.com/vapor/vapor.git",
133133
"state": {
134134
"branch": null,
135-
"revision": "c70d45fe9cce525df5b5f4793a232596cd85484b",
136-
"version": "4.5.0"
135+
"revision": "dc2aa1e02e04a47b67cb0dabed628fe844900f30",
136+
"version": "4.14.0"
137137
}
138138
},
139139
{
140140
"package": "websocket-kit",
141141
"repositoryURL": "https://github.com/vapor/websocket-kit.git",
142142
"state": {
143143
"branch": null,
144-
"revision": "f46778e3f1452cc80a0a6c422cdc52a5d0258795",
145-
"version": "2.0.0"
144+
"revision": "021edd1ca55451ad15b3e84da6b4064e4b877b34",
145+
"version": "2.1.0"
146146
}
147147
}
148148
]

‎Chapter 03/myProject/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let package = Package(
88
],
99
dependencies: [
1010
// 💧 A server-side Swift web framework.
11-
.package(url: "https://github.com/vapor/vapor.git", from: "4.5.0"),
11+
.package(url: "https://github.com/vapor/vapor.git", from: "4.14.0"),
1212
.package(url: "https://github.com/vapor/leaf.git", from: "4.0.0-rc"),
1313
],
1414
targets: [

‎Chapter 03/myProject/Sources/App/Modules/Blog/BlogFrontendController.swift

+1
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ struct BlogFrontendController {
2727
return req.view.render("post", context).encodeResponse(for: req)
2828
}
2929
}
30+

‎Chapter 03/myProject/Sources/App/Modules/Blog/BlogRepository.swift

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,42 @@ struct BlogRepository {
77
BlogPost(title: "Indonesia",
88
slug: "indonesia",
99
image: "/images/posts/05.jpg",
10-
excerpt: "Et excepturi id harum ipsam doloremque.",
10+
excerpt: "Et excepturi id harum ipsam doloremque",
1111
date: "2019",
1212
category: "Islands",
13-
content: "Accusantium amet vero numquam tenetur sit quidem ut. Officiis in iste adipisci corporis. Nisi aut consequatur laudantium et veritatis aut amet officiis. Repellat sapiente quis cupiditate veniam est. Est tempora molestiae voluptatum excepturi eum. Eos provident labore quidem ipsam."),
13+
content: "Accusantium amet vero numquam tenetur sit quidem ut..."),
1414

1515
BlogPost(title: "Mauritius",
1616
slug: "mauritius",
1717
image: "/images/posts/04.jpg",
18-
excerpt: "Pariatur debitis quod occaecati quidem. ",
18+
excerpt: "Pariatur debitis quod occaecati quidem",
1919
date: "2016",
2020
category: "Islands",
21-
content: "Enim et a ex quisquam qui sed fuga consectetur. Dolorem et eum non dicta modi tempora facilis. Totam dolores repudiandae magni autem doloremque. Libero consequuntur et distinctio esse a consectetur. Fugit quis sed provident est sunt. Rerum quibusdam blanditiis optio autem."),
21+
content: "Enim et a ex quisquam qui sed fuga consectetur..."),
2222

2323
BlogPost(title: "California",
2424
slug: "california",
2525
image: "/images/posts/03.jpg",
26-
excerpt: "Voluptates ipsa eos sit distinctio.",
26+
excerpt: "Voluptates ipsa eos sit distinctio",
2727
date: "2015",
2828
category: nil,
29-
content: "Et non reiciendis et illum corrupti. Et ducimus optio commodi molestiae quis ipsum consequatur. A fugit amet amet qui tenetur. Aut voluptates ut labore consectetur temporibus consectetur. Perferendis et neque id minima voluptatem temporibus a dolor. Eos nihil dignissimos consequuntur et consequuntur nam."),
29+
content: "Et non reiciendis et illum corrupti..."),
3030

3131
BlogPost(title: "The Maldives",
3232
slug: "the-maldives",
3333
image: "/images/posts/02.jpg",
34-
excerpt: "Possimus est labore recusandae asperiores fuga sequi sit.",
34+
excerpt: "Possimus est labore recusandae asperiores",
3535
date: "2014",
3636
category: "Islands",
37-
content: "Dignissimos mollitia doloremque omnis repellendus quibusdam ut amet. Autem vitae enim consequuntur. Quis quo esse numquam doloremque esse. Neque accusantium sint tempore distinctio. Dolorem quibusdam et ab impedit necessitatibus cum. Eius voluptatem ducimus velit non."),
37+
content: "Dignissimos mollitia doloremque omnis repellendus..."),
3838

3939
BlogPost(title: "Sri Lanka",
4040
slug: "sri-lanka",
4141
image: "/images/posts/01.jpg",
42-
excerpt: "Ratione est quo nemo dolor placeat dolore.",
42+
excerpt: "Ratione est quo nemo dolor placeat dolore",
4343
date: "2014",
4444
category: "Islands",
45-
content: "Deserunt nulla culpa aspernatur ea a accusantium quia quibusdam. Ducimus delectus ea ipsa quisquam aut in deleniti quia. Error aliquam harum earum. Quos dignissimos dolores ratione illo. Dolores velit sunt sed quas quis itaque sit omnis. Molestias explicabo aut eum amet blanditiis quia similique soluta."),
45+
content: "Deserunt nulla culpa aspernatur ea a accusantium..."),
4646
]
4747
}
4848
}

0 commit comments

Comments
 (0)