From b22dccdd5fdf39a23c4d13a5e310f8730ad179d1 Mon Sep 17 00:00:00 2001 From: Fabian Fett Date: Wed, 20 Apr 2022 09:37:07 +0200 Subject: [PATCH] Drop Swift 5.2 and 5.3 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. In this commit we drop support for Swift 5.2 and 5.3. --- .swiftformat | 2 +- Package.swift | 2 +- docker/Dockerfile | 3 +-- docker/Dockerfile.ubuntu | 36 ------------------------------ docker/docker-compose.1804.52.yaml | 20 ----------------- docker/docker-compose.al2.52.yaml | 18 --------------- docker/docker-compose.al2.53.yaml | 18 --------------- readme.md | 4 ++-- 8 files changed, 5 insertions(+), 98 deletions(-) delete mode 100644 docker/Dockerfile.ubuntu delete mode 100644 docker/docker-compose.1804.52.yaml delete mode 100644 docker/docker-compose.al2.52.yaml delete mode 100644 docker/docker-compose.al2.53.yaml diff --git a/.swiftformat b/.swiftformat index 80fed268..2458d1bc 100644 --- a/.swiftformat +++ b/.swiftformat @@ -1,6 +1,6 @@ # file options ---swiftversion 5.2 +--swiftversion 5.4 --exclude .build # format options diff --git a/Package.swift b/Package.swift index ca0db60e..90ace14b 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.4 import PackageDescription diff --git a/docker/Dockerfile b/docker/Dockerfile index 9979f708..28d65fc1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,4 @@ -ARG swift_version=5.2 -# FIXME when 5.2 images are available +ARG swift_version=5.4 ARG base_image=swift:$swift_version-amazonlinux2 FROM $base_image # needed to do again after FROM due to docker limitation diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu deleted file mode 100644 index cfd977cd..00000000 --- a/docker/Dockerfile.ubuntu +++ /dev/null @@ -1,36 +0,0 @@ -ARG swift_version=5.0 -ARG ubuntu_version=bionic -ARG base_image=swift:$swift_version-$ubuntu_version -FROM $base_image -# needed to do again after FROM due to docker limitation -ARG swift_version -ARG ubuntu_version - -# set as UTF-8 -RUN apt-get update && apt-get install -y locales locales-all -ENV LC_ALL en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 - -# dependencies -RUN apt-get update && apt-get install -y wget -RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by integration tests - -# ruby and jazzy for docs generation -RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev -RUN gem install jazzy --no-ri --no-rdoc - -# tools -RUN mkdir -p $HOME/.tools -RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile - -# script to allow mapping framepointers on linux (until part of the toolchain) -RUN wget -q https://raw.githubusercontent.com/apple/swift/master/utils/symbolicate-linux-fatal -O $HOME/.tools/symbolicate-linux-fatal -RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal - -# swiftformat (until part of the toolchain) - -ARG swiftformat_version=0.44.6 -RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format -RUN cd $HOME/.tools/swift-format && swift build -c release -RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat diff --git a/docker/docker-compose.1804.52.yaml b/docker/docker-compose.1804.52.yaml deleted file mode 100644 index 29c77277..00000000 --- a/docker/docker-compose.1804.52.yaml +++ /dev/null @@ -1,20 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda:18.04-5.2 - build: - dockerfile: Dockerfile.ubuntu - args: - ubuntu_version: "bionic" - swift_version: "5.2" - - test: - image: swift-aws-lambda:18.04-5.2 - - test-samples: - image: swift-aws-lambda:18.04-5.2 - - shell: - image: swift-aws-lambda:18.04-5.2 diff --git a/docker/docker-compose.al2.52.yaml b/docker/docker-compose.al2.52.yaml deleted file mode 100644 index 30f12089..00000000 --- a/docker/docker-compose.al2.52.yaml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda:al2-5.2 - build: - args: - swift_version: "5.2" - - test: - image: swift-aws-lambda:al2-5.2 - - test-samples: - image: swift-aws-lambda:al2-5.2 - - shell: - image: swift-aws-lambda:al2-5.2 diff --git a/docker/docker-compose.al2.53.yaml b/docker/docker-compose.al2.53.yaml deleted file mode 100644 index 628a1892..00000000 --- a/docker/docker-compose.al2.53.yaml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda:al2-5.3 - build: - args: - swift_version: "5.3" - - test: - image: swift-aws-lambda:al2-5.3 - - test-samples: - image: swift-aws-lambda:al2-5.3 - - shell: - image: swift-aws-lambda:al2-5.3 diff --git a/readme.md b/readme.md index 38d71d2c..a76016b7 100644 --- a/readme.md +++ b/readme.md @@ -17,7 +17,7 @@ If you have never used AWS Lambda or Docker before, check out this [getting star First, create a SwiftPM project and pull Swift AWS Lambda Runtime as dependency into your project ```swift - // swift-tools-version:5.2 + // swift-tools-version:5.6 import PackageDescription @@ -80,7 +80,7 @@ Next, create a `main.swift` and implement your Lambda. First, add a dependency on the event packages: ```swift - // swift-tools-version:5.2 + // swift-tools-version:5.6 import PackageDescription