Skip to content

Commit

Permalink
Vapor version bump & template fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@tib
tib committed Nov 9, 2020
1 parent 00f10ba commit c38ad38
Show file tree
Hide file tree
Showing 26 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Chapter 02/SPM/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let package = Package(
.executable(name: "myProject", targets: ["myProject"]),
],
dependencies: [
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
],
targets: [
.target(name: "myProject", dependencies: [
Expand Down
2 changes: 1 addition & 1 deletion Chapter 02/VaporToolbox/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0")
.package(url: "https://github.com/vapor/vapor", from: "4.35.0")
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion Chapter 03/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/lukaskubanek/LoremSwiftum", from: "2.2.1")
Expand Down
2 changes: 1 addition & 1 deletion Chapter 04/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Chapter 05/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Chapter 06/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
4 changes: 2 additions & 2 deletions Chapter 06/myProject/Sources/App/Modules/Blog/Views/Admin/Posts/Edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
#endif
</div>

<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")">
<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")/">
<input type="hidden" name="id" value="#(edit.id)">

<section>
Expand Down Expand Up @@ -43,7 +43,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
</section>

<section>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</label></span>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</span></label>
<input type="text" name="date" value="#(edit.date.value)" class="field">
#if(edit.date.error != nil):
<span class="error">#(edit.date.error)</span>
Expand Down
2 changes: 1 addition & 1 deletion Chapter 07/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
4 changes: 2 additions & 2 deletions Chapter 07/myProject/Sources/App/Modules/Blog/Views/Admin/Posts/Edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
#endif
</div>

<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")" enctype="multipart/form-data">
<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")/" enctype="multipart/form-data">
<input type="hidden" name="id" value="#(edit.id)">

<section>
Expand Down Expand Up @@ -59,7 +59,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
</section>

<section>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</label></span>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</span></label>
<input type="text" name="date" value="#(edit.date.value)" class="field">
#if(edit.date.error != nil):
<span class="error">#(edit.date.error)</span>
Expand Down
2 changes: 1 addition & 1 deletion Chapter 08/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Chapter 08/myProject/Sources/App/Modules/Blog/Views/Admin/Categories/Edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h2><a href="/admin/blog/categories/">Categories</a> / #(edit.id != nil ? "Edit" : "Create")</h2>
</div>

<form id="category-edit-form" class="wrapper" method="post" action="/admin/blog/categories/#(edit.id ?? "new")">
<form id="category-edit-form" class="wrapper" method="post" action="/admin/blog/categories/#(edit.id ?? "new")/">
<input type="hidden" name="id" value="#(edit.id)">

<section>
Expand Down
4 changes: 2 additions & 2 deletions Chapter 08/myProject/Sources/App/Modules/Blog/Views/Admin/Posts/Edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
#endif
</div>

<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")" enctype="multipart/form-data">
<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")/" enctype="multipart/form-data">
<input type="hidden" name="id" value="#(edit.id)">

<section>
Expand Down Expand Up @@ -59,7 +59,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
</section>

<section>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</label></span>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</span></label>
<input type="text" name="date" value="#(edit.date.value)" class="field">
#if(edit.date.error != nil):
<span class="error">#(edit.date.error)</span>
Expand Down
2 changes: 1 addition & 1 deletion Chapter 09/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Chapter 09/myProject/Sources/App/Modules/Blog/Views/Admin/Categories/Edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h2><a href="/admin/blog/categories/">Categories</a> / #(edit.id != nil ? "Edit" : "Create")</h2>
</div>

<form id="category-edit-form" class="wrapper" method="post" action="/admin/blog/categories/#(edit.id ?? "new")">
<form id="category-edit-form" class="wrapper" method="post" action="/admin/blog/categories/#(edit.id ?? "new")/">
<input type="hidden" name="id" value="#(edit.id)">

<section>
Expand Down
4 changes: 2 additions & 2 deletions Chapter 09/myProject/Sources/App/Modules/Blog/Views/Admin/Posts/Edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
#endif
</div>

<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")" enctype="multipart/form-data">
<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")/" enctype="multipart/form-data">
<input type="hidden" name="id" value="#(edit.id)">

<section>
Expand Down Expand Up @@ -59,7 +59,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
</section>

<section>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</label></span>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</span></label>
<input type="text" name="date" value="#(edit.date.value)" class="field">
#if(edit.date.error != nil):
<span class="error">#(edit.date.error)</span>
Expand Down
2 changes: 1 addition & 1 deletion Chapter 10/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Chapter 10/myProject/Sources/App/Modules/Blog/Views/Admin/Categories/Edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h2><a href="/admin/blog/categories/">Categories</a> / #(edit.id != nil ? "Edit" : "Create")</h2>
</div>

<form id="category-edit-form" class="wrapper" method="post" action="/admin/blog/categories/#(edit.id ?? "new")">
<form id="category-edit-form" class="wrapper" method="post" action="/admin/blog/categories/#(edit.id ?? "new")/">
<input type="hidden" name="id" value="#(edit.id)">

<section>
Expand Down
4 changes: 2 additions & 2 deletions Chapter 10/myProject/Sources/App/Modules/Blog/Views/Admin/Posts/Edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
#endif
</div>

<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")" enctype="multipart/form-data">
<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")/" enctype="multipart/form-data">
<input type="hidden" name="id" value="#(edit.id)">

<section>
Expand Down Expand Up @@ -59,7 +59,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
</section>

<section>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</label></span>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</span></label>
<input type="text" name="date" value="#(edit.date.value)" class="field">
#if(edit.date.error != nil):
<span class="error">#(edit.date.error)</span>
Expand Down
2 changes: 1 addition & 1 deletion Chapter 11/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Chapter 11/myProject/Sources/App/Modules/Blog/Views/Admin/Categories/Edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h2><a href="/admin/blog/categories/">Categories</a> / #(edit.id != nil ? "Edit" : "Create")</h2>
</div>

<form id="category-edit-form" class="wrapper" method="post" action="/admin/blog/categories/#(edit.id ?? "new")">
<form id="category-edit-form" class="wrapper" method="post" action="/admin/blog/categories/#(edit.id ?? "new")/">
<input type="hidden" name="id" value="#(edit.id)">

<section>
Expand Down
4 changes: 2 additions & 2 deletions Chapter 11/myProject/Sources/App/Modules/Blog/Views/Admin/Posts/Edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
#endif
</div>

<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")" enctype="multipart/form-data">
<form id="post-edit-form" class="wrapper" method="post" action="/admin/blog/posts/#(edit.id ?? "new")/" enctype="multipart/form-data">
<input type="hidden" name="id" value="#(edit.id)">

<section>
Expand Down Expand Up @@ -59,7 +59,7 @@ <h2><a href="/admin/blog/posts/">Posts</a> / #(edit.id != nil ? "Edit" : "Create
</section>

<section>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</label></span>
<label for="date">Date <span class="required">(Y.MM.dd. HH:mm:ss)</span></label>
<input type="text" name="date" value="#(edit.date.value)" class="field">
#if(edit.date.error != nil):
<span class="error">#(edit.date.error)</span>
Expand Down
2 changes: 1 addition & 1 deletion Chapter 12/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Chapter 13/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Chapter 14/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Chapter 15/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down
2 changes: 1 addition & 1 deletion Chapter 16/myProject/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
],
dependencies: [
// 💧 A server-side Swift web framework.
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
.package(url: "https://github.com/vapor/vapor", from: "4.35.0"),
.package(url: "https://github.com/vapor/leaf", .exact("4.0.0-tau.1")),
.package(url: "https://github.com/vapor/leaf-kit", .exact("1.0.0-tau.1.1")),
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
Expand Down

0 comments on commit c38ad38

Please sign in to comment.