From 59971a8c69be22a89ab00fdb358fbafc5d2db26e Mon Sep 17 00:00:00 2001 From: Fabian Fett Date: Thu, 21 Apr 2022 08:49:12 +0200 Subject: [PATCH] Drop support for Swift 5.2 and 5.3 (#154) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As outlined in a [Swift forums post in November ’21](https://forums.swift.org/t/swiftnio-swift-version-support/53232), SwiftNIO will only support the latest non-patch Swift release and the 2 immediately prior non-patch versions. - drop support for Swift 5.2 and 5.3. - update CI for Swift 5.4 to run on bionic instead of focal to ensure that we still test bionic. --- Package.swift | 2 +- README.md | 4 ++-- docker/Dockerfile | 2 +- docker/docker-compose.1604.52.yaml | 18 ------------------ docker/docker-compose.1804.53.yaml | 16 ---------------- docker/docker-compose.1804.54.yaml | 17 +++++++++++++++++ docker/docker-compose.2004.54.yaml | 17 ----------------- 7 files changed, 21 insertions(+), 55 deletions(-) delete mode 100644 docker/docker-compose.1604.52.yaml delete mode 100644 docker/docker-compose.1804.53.yaml create mode 100644 docker/docker-compose.1804.54.yaml delete mode 100644 docker/docker-compose.2004.54.yaml diff --git a/Package.swift b/Package.swift index 6373c113..d49419fc 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.4 //===----------------------------------------------------------------------===// // // This source file is part of the SwiftNIO open source project diff --git a/README.md b/README.md index cb2319a1..13a17b9b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ All code will go through code review like in the other repositories related to t `swift-nio-extras` part of the SwiftNIO 2 family of repositories and depends on the following: - [`swift-nio`](https://github.com/apple/swift-nio), version 2.30.0 or better. -- Swift 5.2. +- Swift 5.4. - `zlib` and its development headers installed on the system. But don't worry, you'll find `zlib` on pretty much any UNIX system that can compile any sort of code. To depend on `swift-nio-extras`, put the following in the `dependencies` of your `Package.swift`: @@ -25,7 +25,7 @@ To depend on `swift-nio-extras`, put the following in the `dependencies` of your ### Support for older Swift versions -Earlier versions of SwiftNIO (2.29.x and lower) and SwiftNIOExtras (1.9.x and lower) supported Swift 5.0 and 5.1. +Earlier versions of SwiftNIO (2.39.x and lower) and SwiftNIOExtras (1.10.x and lower) supported Swift 5.2 and 5.3, SwiftNIO (2.29.x and lower) and SwiftNIOExtras (1.9.x and lower) supported Swift 5.0 and 5.1. On the [`nio-extras-0.1`](https://github.com/apple/swift-nio-extras/tree/nio-extras-0.1) branch, you can find the `swift-nio-extras` version for the SwiftNIO 1 family. It requires Swift 4.1 or better. diff --git a/docker/Dockerfile b/docker/Dockerfile index 377c53d6..9e20b07b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG swift_version=5.2 +ARG swift_version=5.4 ARG ubuntu_version=focal ARG base_image=swift:$swift_version-$ubuntu_version FROM $base_image diff --git a/docker/docker-compose.1604.52.yaml b/docker/docker-compose.1604.52.yaml deleted file mode 100644 index 3a6a8000..00000000 --- a/docker/docker-compose.1604.52.yaml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-nio-extras:16.04-5.2 - build: - args: - ubuntu_version: "xenial" - swift_version: "5.2" - - test: - image: swift-nio-extras:16.04-5.2 - environment: - - SANITIZER_ARG=--sanitize=thread - - shell: - image: swift-nio-extras:16.04-5.2 diff --git a/docker/docker-compose.1804.53.yaml b/docker/docker-compose.1804.53.yaml deleted file mode 100644 index a6b1256a..00000000 --- a/docker/docker-compose.1804.53.yaml +++ /dev/null @@ -1,16 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-nio-extras:18.04-5.3 - build: - args: - ubuntu_version: "bionic" - swift_version: "5.3" - - test: - image: swift-nio-extras:18.04-5.3 - - shell: - image: swift-nio-extras:18.04-5.3 diff --git a/docker/docker-compose.1804.54.yaml b/docker/docker-compose.1804.54.yaml new file mode 100644 index 00000000..d607fb6e --- /dev/null +++ b/docker/docker-compose.1804.54.yaml @@ -0,0 +1,17 @@ +version: "3" + +services: + + runtime-setup: + image: swift-nio-extras:18.04-5.4 + build: + args: + base_image: "swift:5.4-bionic" + ubuntu_version: "bionic" + swift_version: "5.4" + + test: + image: swift-nio-extras:18.04-5.4 + + shell: + image: swift-nio-extras:18.04-5.4 diff --git a/docker/docker-compose.2004.54.yaml b/docker/docker-compose.2004.54.yaml deleted file mode 100644 index 3cd79933..00000000 --- a/docker/docker-compose.2004.54.yaml +++ /dev/null @@ -1,17 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-nio-extras:20.04-5.4 - build: - args: - base_image: "swift:5.4-focal" - ubuntu_version: "focal" - swift_version: "5.4" - - test: - image: swift-nio-extras:20.04-5.4 - - shell: - image: swift-nio-extras:20.04-5.4