apple/swift-nio-extras
1
0
Fork 0
mirror of https://github.com/apple/swift-nio-extras.git synced 2025-05-23 05:49:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove support for Swift 5.0 and 5.1 ()

Browse Source 
Changes made:

Removed CI config for 5.0 ad 5.1
Changed 5.2 to be based on 16.04 so we have some coverage there
Converted Package.swift to the latest syntax
Added a description to supported Swift versions in the README
This commit is contained in:
David Evans 2021-06-22 18:07:01 +01:00 committed by GitHub
parent 79c0d26ba8
commit c67aa046e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 87 additions and 58 deletions

93
Package.swift

@ -1,4 +1,4 @@
// swift-tools-version:5.0 // swift-tools-version:5.2
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This source file is part of the SwiftNIO open source project // This source file is part of the SwiftNIO open source project
@ -16,22 +16,81 @@
import PackageDescription import PackageDescription
var targets: [PackageDescription.Target] = [ var targets: [PackageDescription.Target] = [
.target(name: "NIOExtras", dependencies: ["NIO"]), .target(
.target(name: "NIOHTTPCompression", dependencies: ["NIO", "NIOHTTP1", "CNIOExtrasZlib"]), name: "NIOExtras",
.target(name: "HTTPServerWithQuiescingDemo", dependencies: ["NIOExtras", "NIOHTTP1"]), dependencies: [
.target(name: "NIOWritePCAPDemo", dependencies: ["NIO", "NIOExtras", "NIOHTTP1"]), .product(name: "NIO", package: "swift-nio")
.target(name: "NIOWritePartialPCAPDemo", dependencies: ["NIO", "NIOExtras", "NIOHTTP1"]), ]),
.target(name: "NIOExtrasPerformanceTester", dependencies: ["NIO", "NIOExtras", "NIOHTTP1"]), .target(
.target(name: "NIOSOCKS", dependencies: ["NIO"]), name: "NIOHTTPCompression",
.target(name: "NIOSOCKSClient", dependencies: ["NIO", "NIOSOCKS"]), dependencies: [
.target(name: "CNIOExtrasZlib", "CNIOExtrasZlib",
dependencies: [], .product(name: "NIO", package: "swift-nio"),
linkerSettings: [ .product(name: "NIOHTTP1", package: "swift-nio"),
.linkedLibrary("z") ]),
]), .target(
.testTarget(name: "NIOExtrasTests", dependencies: ["NIOExtras", "NIO", "NIOTestUtils", "NIOConcurrencyHelpers"]), name: "HTTPServerWithQuiescingDemo",
.testTarget(name: "NIOHTTPCompressionTests", dependencies: ["NIOHTTPCompression"]), dependencies: [
.testTarget(name: "NIOSOCKSTests", dependencies: ["NIO", "NIOSOCKS"]) "NIOExtras",
.product(name: "NIOHTTP1", package: "swift-nio"),
]),
.target(
name: "NIOWritePCAPDemo",
dependencies: [
"NIOExtras",
.product(name: "NIO", package: "swift-nio"),
.product(name: "NIOHTTP1", package: "swift-nio"),
]),
.target(
name: "NIOWritePartialPCAPDemo",
dependencies: [
"NIOExtras",
.product(name: "NIO", package: "swift-nio"),
.product(name: "NIOHTTP1", package: "swift-nio"),
]),
.target(
name: "NIOExtrasPerformanceTester",
dependencies: [
"NIOExtras",
.product(name: "NIO", package: "swift-nio"),
.product(name: "NIOHTTP1", package: "swift-nio"),
]),
.target(
name: "NIOSOCKS",
dependencies: [
.product(name: "NIO", package: "swift-nio")
]),
.target(
name: "NIOSOCKSClient",
dependencies: [
.product(name: "NIO", package: "swift-nio"),
"NIOSOCKS"
]),
.target(
name: "CNIOExtrasZlib",
dependencies: [],
linkerSettings: [
.linkedLibrary("z")
]),
.testTarget(
name: "NIOExtrasTests",
dependencies: [
"NIOExtras",
.product(name: "NIO", package: "swift-nio"),
.product(name: "NIOTestUtils", package: "swift-nio"),
.product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
]),
.testTarget(
name: "NIOHTTPCompressionTests",
dependencies: [
"NIOHTTPCompression"
]),
.testTarget(
name: "NIOSOCKSTests",
dependencies: [
"NIOSOCKS",
.product(name: "NIO", package: "swift-nio"),
])
] ]
let package = Package( let package = Package(

6
README.md

@ -13,8 +13,8 @@ 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-extras` part of the SwiftNIO 2 family of repositories and depends on the following:
- [`swift-nio`](https://github.com/apple/swift-nio), version 2.0.0 or better. - [`swift-nio`](https://github.com/apple/swift-nio), version 2.29.0 or better.
- Swift 5.0. - Swift 5.2.
- `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. - `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`: To depend on `swift-nio-extras`, put the following in the `dependencies` of your `Package.swift`:
@ -25,6 +25,8 @@ To depend on `swift-nio-extras`, put the following in the `dependencies` of your
### Support for older Swift versions ### 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.
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. 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.
## Current Contents ## Current Contents

4
docker/Dockerfile

@ -1,5 +1,5 @@
ARG swift_version=5.0 ARG swift_version=5.2
ARG ubuntu_version=bionic ARG ubuntu_version=focal
ARG base_image=swift:$swift_version-$ubuntu_version ARG base_image=swift:$swift_version-$ubuntu_version
FROM $base_image FROM $base_image
# needed to do again after FROM due to docker limitation # needed to do again after FROM due to docker limitation

8
docker/docker-compose.1604.51.yaml → docker/docker-compose.1604.52.yaml

@ -3,16 +3,16 @@ version: "3"
services: services:
runtime-setup: runtime-setup:
image: swift-nio-extras:16.04-5.1 image: swift-nio-extras:16.04-5.2
build: build:
args: args:
ubuntu_version: "xenial" ubuntu_version: "xenial"
swift_version: "5.1" swift_version: "5.2"
test: test:
image: swift-nio-extras:16.04-5.1 image: swift-nio-extras:16.04-5.2
environment: environment:
- SANITIZER_ARG=--sanitize=thread - SANITIZER_ARG=--sanitize=thread
shell: shell:
image: swift-nio-extras:16.04-5.1 image: swift-nio-extras:16.04-5.2

16
docker/docker-compose.1804.50.yaml

@ -1,16 +0,0 @@
version: "3"
services:
runtime-setup:
image: swift-nio-extras:18.04-5.0
build:
args:
ubuntu_version: "bionic"
swift_version: "5.0"
test:
image: swift-nio-extras:18.04-5.0
shell:
image: swift-nio-extras:18.04-5.0

16
docker/docker-compose.1804.52.yaml

@ -1,16 +0,0 @@
version: "3"
services:
runtime-setup:
image: swift-nio-extras:18.04-5.2
build:
args:
ubuntu_version: "bionic"
swift_version: "5.2"
test:
image: swift-nio-extras:18.04-5.2
shell:
image: swift-nio-extras:18.04-5.2

2
scripts/check_no_api_breakages.sh

@ -109,7 +109,7 @@ for old_tag in "$@"; do
> "$report" 2>&1 > "$report" 2>&1
fi fi
if ! shasum "$report" | grep -q cefc4ee5bb7bcdb7cb5a7747efa178dab3c794d5; then if ! shasum "$report" | grep -q afd2a1b542b33273920d65821deddc653063c700; then
echo ERROR echo ERROR
echo >&2 "==============================" echo >&2 "=============================="
echo >&2 "ERROR: public API change in $f" echo >&2 "ERROR: public API change in $f"