Skip to content

Commit 1ee8caa

Browse files
fpseverinogwynne
andauthored
Update to Swift 6.3 (#172)
* Update to Swift 6.3 * Update README.md Co-authored-by: Gwynne Raskind <gwynne@vapor.codes> --------- Co-authored-by: Gwynne Raskind <gwynne@vapor.codes>
1 parent 87f0b15 commit 1ee8caa

8 files changed

Lines changed: 32 additions & 25 deletions

File tree

.github/workflows/test-template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
permissions:
1515
contents: read
1616
env:
17-
SWIFT_IMAGE: 'swift:6.1-noble'
17+
SWIFT_IMAGE: 'swift:6.3-noble'
1818

1919
jobs:
2020

@@ -66,7 +66,7 @@ jobs:
6666
fail-fast: false
6767
matrix:
6868
swift-image:
69-
- 'swift:6.1-noble'
69+
- 'swift:6.3-noble'
7070
fluentflags:
7171
- '--no-fluent'
7272
- '--fluent.db mysql'

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:6.1-noble AS build
4+
FROM swift:6.3-noble AS build
55

66
# Install OS updates
77
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \

Package.swift

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:6.0
1+
// swift-tools-version:6.3
22
import PackageDescription
33

44
let package = Package(
@@ -8,15 +8,15 @@ let package = Package(
88
],
99
dependencies: [
1010
// 💧 A server-side Swift web framework.
11-
.package(url: "https://github.com/vapor/vapor.git", from: "4.115.0"),{{#fluent}}
11+
.package(url: "https://github.com/vapor/vapor.git", from: "4.121.4"),{{#fluent}}
1212
// 🗄 An ORM for SQL and NoSQL databases.
13-
.package(url: "https://github.com/vapor/fluent.git", from: "4.9.0"),
13+
.package(url: "https://github.com/vapor/fluent.git", from: "4.13.0"),
1414
// {{fluent.db.emoji}} Fluent driver for {{fluent.db.module}}.
1515
.package(url: "https://github.com/vapor/fluent-{{fluent.db.url}}-driver.git", from: "{{fluent.db.version}}"),{{/fluent}}{{#leaf}}
1616
// 🍃 An expressive, performant, and extensible templating language built for Swift.
17-
.package(url: "https://github.com/vapor/leaf.git", from: "4.3.0"),{{/leaf}}
17+
.package(url: "https://github.com/vapor/leaf.git", from: "4.5.1"),{{/leaf}}
1818
// 🔵 Non-blocking, event-driven networking for Swift. Used for custom executors
19-
.package(url: "https://github.com/apple/swift-nio.git", from: "2.65.0"),
19+
.package(url: "https://github.com/apple/swift-nio.git", from: "2.101.0"),
2020
],
2121
targets: [
2222
.executableTarget(
@@ -44,4 +44,8 @@ let package = Package(
4444

4545
var swiftSettings: [SwiftSetting] { [
4646
.enableUpcomingFeature("ExistentialAny"),
47+
.enableUpcomingFeature("InternalImportsByDefault"),
48+
.enableUpcomingFeature("MemberImportVisibility"),
49+
.enableUpcomingFeature("InferIsolatedConformances"),
50+
.enableUpcomingFeature("ImmutableWeakCaptures"),
4751
] }

README.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
<p align="center">
2-
<img src="https://user-images.githubusercontent.com/1342803/36623515-7293b4ec-18d3-11e8-85ab-4e2f8fb38fbd.png" width="320" alt="Vapor Template">
3-
<br>
4-
<br>
5-
<a href="https://docs.vapor.codes/4.0/"><img src="https://design.vapor.codes/images/readthedocs.svg" alt="Documentation"></a>
6-
<a href="https://discord.gg/vapor"><img src="https://design.vapor.codes/images/discordchat.svg" alt="Team Chat"></a>
7-
<a href="LICENSE"><img src="https://design.vapor.codes/images/mitlicense.svg" alt="MIT License"></a>
8-
<a href="https://github.com/vapor/template/actions/workflows/test-template.yml"><img src="https://img.shields.io/github/actions/workflow/status/vapor/template/test-template.yml?event=push&style=plastic&logo=github&label=tests&logoColor=%23ccc" alt="Continuous Integration"></a>
9-
<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift60up.svg" alt="Swift 6.0+"></a>
10-
</p>
1+
<div align="center">
2+
3+
<img src="https://user-images.githubusercontent.com/1342803/36623515-7293b4ec-18d3-11e8-85ab-4e2f8fb38fbd.png" width="320" alt="Vapor Template">
4+
<br>
5+
<br>
6+
7+
[![Documentation](https://design.vapor.codes/images/readthedocs.svg)](https://docs.vapor.codes/4.0/)
8+
[![Team Chat](https://design.vapor.codes/images/discordchat.svg)](https://discord.gg/vapor)
9+
[![MIT License](https://design.vapor.codes/images/mitlicense.svg)](./LICENSE)
10+
[![Continuous Integration](https://img.shields.io/github/actions/workflow/status/vapor/template/test-template.yml?event=push&style=plastic&logo=github&label=tests&logoColor=ccc)](https://github.com/vapor/template/actions/workflows/test-template.yml)
11+
[![Swift 6.3+](https://design.vapor.codes/images/swift63up.svg)](https://swift.org)
12+
13+
</div>
1114

1215
The official Vapor template, used by the [Vapor Toolbox](https://github.com/vapor/toolbox) to generate new projects.
1316

Sources/App/configure.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import Fluent{{fluent.db.module}}Driver
44
{{/fluent}}{{#leaf}}import Leaf
55
{{/leaf}}import Vapor
66

7-
// configures your application
8-
public func configure(_ app: Application) async throws {
7+
/// configures your application
8+
func configure(_ app: Application) async throws {
99
// uncomment to serve files from /Public folder
1010
// app.middleware.use(FileMiddleware(publicDirectory: app.directory.publicDirectory)){{#fluent}}
1111

TEMPLATE_README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ swift test
2424
- [Vapor Website](https://vapor.codes)
2525
- [Vapor Documentation](https://docs.vapor.codes)
2626
- [Vapor GitHub](https://github.com/vapor)
27-
- [Vapor Community](https://github.com/vapor-community)
27+
- [Vapor Community maintained packages](https://github.com/vapor-community)

Tests/AppTests/AppTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ struct {{name}}Tests {
8282
{{#fluent}}
8383

8484
extension TodoDTO: Equatable {
85-
public static func == (lhs: Self, rhs: Self) -> Bool {
85+
static func == (lhs: Self, rhs: Self) -> Bool {
8686
lhs.id == rhs.id && lhs.title == rhs.title
8787
}
8888
}

manifest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ variables:
1414
module: Postgres
1515
url: postgres
1616
id: psql
17-
version: "2.8.0"
17+
version: "2.12.0"
1818
is_postgres: true
1919
emoji: "\U0001F418"
2020
- name: MySQL
@@ -23,7 +23,7 @@ variables:
2323
module: MySQL
2424
url: mysql
2525
id: mysql
26-
version: "4.4.0"
26+
version: "4.8.0"
2727
is_mysql: true
2828
emoji: "\U0001F42C"
2929
- name: SQLite
@@ -32,7 +32,7 @@ variables:
3232
module: SQLite
3333
url: sqlite
3434
id: sqlite
35-
version: "4.6.0"
35+
version: "4.9.0"
3636
is_sqlite: true
3737
emoji: "\U0001FAB6"
3838
- name: leaf

0 commit comments

Comments
 (0)