Skip to content

Commit df69255

Browse files
authored
Swift 5.5 (#6828)
* Swift 5.5 for hummingbird * Swift 5.5 for SwiftNIO * Swift 5.5 for Vapor
1 parent e97c67d commit df69255

File tree

9 files changed

+18
-25
lines changed

9 files changed

+18
-25
lines changed

frameworks/Swift/hummingbird/hummingbird-postgres.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:5.3 as build
4+
FROM swift:5.5 as build
55
WORKDIR /build
66

77
# Copy entire repo into container
88
COPY ./src-postgres .
99

1010
# Compile with optimizations
1111
RUN swift build \
12-
--enable-test-discovery \
1312
-c release \
1413
-Xswiftc -enforce-exclusivity=unchecked
1514

1615
# ================================
1716
# Run image
1817
# ================================
19-
FROM swift:5.3-slim
18+
FROM swift:5.5-slim
2019
WORKDIR /run
2120

2221
# Copy build artifacts

frameworks/Swift/hummingbird/hummingbird.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:5.3 as build
4+
FROM swift:5.5 as build
55
WORKDIR /build
66

77
# Copy entire repo into container
88
COPY ./src .
99

1010
# Compile with optimizations
1111
RUN swift build \
12-
--enable-test-discovery \
1312
-c release \
1413
-Xswiftc -enforce-exclusivity=unchecked
1514

1615
# ================================
1716
# Run image
1817
# ================================
19-
FROM swift:5.3-slim
18+
FROM swift:5.5-slim
2019
WORKDIR /run
2120

2221
# Copy build artifacts

frameworks/Swift/hummingbird/src-postgres/Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ let package = Package(
1010
.executable(name: "server", targets: ["server"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/hummingbird-project/hummingbird.git", .upToNextMinor(from: "0.11.0")),
14-
.package(url: "https://github.com/hummingbird-project/hummingbird-mustache.git", .upToNextMinor(from: "0.5.0")),
15-
.package(url: "https://github.com/vapor/postgres-kit.git", from: "2.0.0"),
13+
.package(url: "https://github.com/hummingbird-project/hummingbird.git", .upToNextMinor(from: "0.13.1")),
14+
.package(url: "https://github.com/hummingbird-project/hummingbird-mustache.git", from: "1.0.0"),
15+
.package(url: "https://github.com/vapor/postgres-kit.git", from: "2.3.0"),
1616
],
1717
targets: [
1818
.target(name: "server",

frameworks/Swift/hummingbird/src/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ let package = Package(
99
.executable(name: "server", targets: ["server"])
1010
],
1111
dependencies: [
12-
.package(url: "https://github.com/hummingbird-project/hummingbird.git", .upToNextMinor(from: "0.11.0")),
12+
.package(url: "https://github.com/hummingbird-project/hummingbird.git", .upToNextMinor(from: "0.13.1")),
1313
],
1414
targets: [
1515
.target(name: "server",

frameworks/Swift/swift-nio/swift-nio.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:5.3 as build
4+
FROM swift:5.5 as build
55
WORKDIR /build
66

77
# Copy entire repo into container
88
COPY ./app .
99

1010
# Compile with optimizations
1111
RUN swift build \
12-
--enable-test-discovery \
1312
-c release \
1413
-Xswiftc -enforce-exclusivity=unchecked
1514

1615
# ================================
1716
# Run image
1817
# ================================
19-
FROM swift:5.3-slim
18+
FROM swift:5.5-slim
2019
WORKDIR /run
2120

2221
# Install Swift dependencies

frameworks/Swift/vapor/vapor-fluent.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:5.3 as build
4+
FROM swift:5.5 as build
55
WORKDIR /build
66

77
# Copy entire repo into container
88
COPY ./vapor-fluent .
99

1010
# Compile with optimizations
1111
RUN swift build \
12-
--enable-test-discovery \
1312
-c release \
1413
-Xswiftc -enforce-exclusivity=unchecked
1514

1615
# ================================
1716
# Run image
1817
# ================================
19-
FROM swift:5.3-slim
18+
FROM swift:5.5-slim
2019
WORKDIR /run
2120

2221
# Copy build artifacts

frameworks/Swift/vapor/vapor-postgres.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:5.3 as build
4+
FROM swift:5.5 as build
55
WORKDIR /build
66

77
# Copy entire repo into container
88
COPY ./vapor-postgres .
99

1010
# Compile with optimizations
1111
RUN swift build \
12-
--enable-test-discovery \
1312
-c release \
1413
-Xswiftc -enforce-exclusivity=unchecked
1514

1615
# ================================
1716
# Run image
1817
# ================================
19-
FROM swift:5.3-slim
18+
FROM swift:5.5-slim
2019
WORKDIR /run
2120

2221
# Copy build artifacts

frameworks/Swift/vapor/vapor-sql-kit.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:5.3 as build
4+
FROM swift:5.5 as build
55
WORKDIR /build
66

77
# Copy entire repo into container
88
COPY ./vapor-sql-kit .
99

1010
# Compile with optimizations
1111
RUN swift build \
12-
--enable-test-discovery \
1312
-c release \
1413
-Xswiftc -enforce-exclusivity=unchecked
1514

1615
# ================================
1716
# Run image
1817
# ================================
19-
FROM swift:5.3-slim
18+
FROM swift:5.5-slim
2019
WORKDIR /run
2120

2221
# Copy build artifacts

frameworks/Swift/vapor/vapor.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:5.3 as build
4+
FROM swift:5.5 as build
55
WORKDIR /build
66

77
# Copy entire repo into container
88
COPY ./vapor-default .
99

1010
# Compile with optimizations
1111
RUN swift build \
12-
--enable-test-discovery \
1312
-c release \
1413
-Xswiftc -enforce-exclusivity=unchecked
1514

1615
# ================================
1716
# Run image
1817
# ================================
19-
FROM swift:5.3-slim
18+
FROM swift:5.5-slim
2019
WORKDIR /run
2120

2221
# Copy build artifacts

0 commit comments

Comments
 (0)