Skip to content

Commit 22d3a24

Browse files
committed
Raise minimum supported Swift version from 5.4 to 5.5
Motivation: We periodically drop support for older Swift versions. Now that 5.7 has been released, 5.4 can be dropped. Modifications: - Remove 5.4 specific Package.swift and docker-compose - Update the 5.7 docker-compose to use the released 5.7 and move from focal (2004) to jammy (2204) Results: Minimum Swift version is 5.5
1 parent d994e50 commit 22d3a24

File tree

6 files changed

+23
-89
lines changed

6 files changed

+23
-89
lines changed

Package@swift-5.4.swift

Lines changed: 0 additions & 47 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ let field = Array("Sec-CH-Example, Sec-CH-Example-2".utf8)
4343

4444
struct AcceptCH: StructuredFieldValue {
4545
static let structuredFieldType: StructuredFieldType = .list
46-
46+
4747
var items: [String]
4848
}
4949

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG swift_version=5.4
2-
ARG ubuntu_version=bionic
1+
ARG swift_version=5.7
2+
ARG ubuntu_version=focal
33
ARG base_image=swift:$swift_version-$ubuntu_version
44
FROM $base_image
55
# needed to do again after FROM due to docker limitation

docker/docker-compose.1804.54.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

docker/docker-compose.2004.57.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

docker/docker-compose.2204.57.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-http-structured-headers:22.04-5.7
7+
build:
8+
args:
9+
ubuntu_version: "jammy"
10+
swift_version: "5.7"
11+
12+
unit-tests:
13+
image: swift-http-structured-headers:22.04-5.7
14+
15+
test:
16+
image: swift-http-structured-headers:22.04-5.7
17+
18+
shell:
19+
image: swift-http-structured-headers:22.04-5.7
20+

0 commit comments

Comments
 (0)