Skip to content

Commit d2fcb61

Browse files
committed
Drop support for Swift 5.0
1 parent 40d1a58 commit d2fcb61

File tree

8 files changed

+19
-362
lines changed

8 files changed

+19
-362
lines changed

.gitlab/ci/test-template.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ stages:
88
variables:
99
REDIS_URL: 'redis'
1010
REDIS_PW: 'password'
11-
SANITIZER_ARG: '--sanitize=thread'
1211
services:
1312
- name: redis:5
1413
alias: 'redis'
1514
command: ["redis-server", "--requirepass", "password"]
1615
script:
17-
- swift build --build-tests $SANITIZER_ARG -v
16+
- swift build --build-tests --enable-test-discovery --sanitize=thread -v
1817
- swift test --skip-build

.gitlab/ci/ubuntu-bionic.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ swift trunk:
88
swift 5.3:
99
extends: .unit-test
1010
image: swiftlang/swift:nightly-5.3-bionic
11-
allow_failure: true
1211

1312
swift 5.2:
1413
extends: .unit-test
@@ -17,9 +16,3 @@ swift 5.2:
1716
swift 5.1:
1817
extends: .unit-test
1918
image: swift:5.1-bionic
20-
21-
swift 5.0:
22-
extends: .unit-test
23-
image: swift:5.0-bionic
24-
variables:
25-
SANITIZER_ARG: ''

.gitlab/ci/ubuntu-xenial.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,3 @@ swift 5.2:
1616
swift 5.1:
1717
extends: .unit-test
1818
image: swift:5.1-xenial
19-
20-
swift 5.0:
21-
extends: .unit-test
22-
image: swift:5.0-xenial
23-
variables:
24-
SANITIZER_ARG: ''

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.0
1+
// swift-tools-version:5.1
22
//===----------------------------------------------------------------------===//
33
//
44
// This source file is part of the RediStack open source project

README.md

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<p>
55
<a href="https://github.com/swift-server/sswg/blob/master/process/incubation.md#sandbox-level"><img src="https://img.shields.io/badge/sswg-sandbox-lightgrey.svg" alt="SSWG Maturity"></a>
66
<a href="https://gitlab.com/Mordil/RediStack/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/License-Apache%202.0-yellow.svg" alt="Apache 2 License"></a>
7-
<a href="https://swift.org"><img src="https://img.shields.io/badge/Swift-5.0+-orange.svg" alt="Swift 5.0+"></a>
7+
<a href="https://swift.org"><img src="https://img.shields.io/badge/Swift-5.1+-orange.svg" alt="Swift 5.1+"></a>
88
<a href="https://redis.io"><img src="https://img.shields.io/badge/Redis-5.0-red.svg" alt="Redis 5.0"></a>
99
</p>
1010

@@ -31,23 +31,23 @@ The table below lists the major releases alongside their compatible language, de
3131

3232
| RediStack Release | [Swift](https://swift.org/download) | [Redis](https://redis.io) | [SwiftNIO](https://github.com/apple/swift-nio) | [SwiftLog](https://github.com/apple/swift-log) | [SwiftMetrics](https://github.com/apple/swift-metrics) |
3333
|:-----------------:|:-----------------------------------:|:-------------------------:|:----------------------------------------------:|:----------------------------------------------:|:------------------------------:|
34-
| `from: "1.0.0-alpha.7"` | 5.0+ | 3.x**¹** < 6.x | 2.x | 1.x | 1.x |
34+
| `from: "1.0.0-alpha.11"` | 5.1+ | 3.x**¹** < 6.x | 2.x | 1.x | 1.x |
3535

3636
> **¹** _Use of newer Redis features on older Redis versions is done at your own risk. See Redis' release notes for [v5](https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES), [v4](https://raw.githubusercontent.com/antirez/redis/4.0/00-RELEASENOTES), and [v3](https://raw.githubusercontent.com/antirez/redis/3.0/00-RELEASENOTES) for what is supported for each version of Redis._
3737
3838
### Supported Operating Systems
3939

40-
**RediStack** runs anywhere that is officially supported by the [Swift project](https://swift.org/download/#releases).
40+
**RediStack** runs anywhere that is officially supported by the [Swift project](https://swift.org/download/#releases)**²**.
4141

42-
See the [test matrix below for more details](#language-and-platform-test-matrix).
42+
> **²** See the [platform support matrix below for more details](#language-and-platform-support).
4343
4444
## Installing
4545

4646
To install **RediStack**, just add the package as a dependency in your **Package.swift**.
4747

4848
```swift
4949
dependencies: [
50-
.package(url: "https://gitlab.com/mordil/RediStack.git", from: "1.0.0-alpha.5")
50+
.package(url: "https://gitlab.com/mordil/RediStack.git", from: "1.0.0-alpha.11")
5151
]
5252
```
5353

@@ -104,16 +104,25 @@ Check out [CONTRIBUTORS.txt](https://gitlab.com/Mordil/RediStack/blob/master/CON
104104
|:---:|:---:|:---:|:---:|:---:|
105105
| [SSWG-0004](https://github.com/swift-server/sswg/blob/master/proposals/0004-nio-redis.md) | [2019-01-07](https://forums.swift.org/t/swiftnio-redis-client/19325) | [2019-04-01](https://forums.swift.org/t/discussion-nioredis-nio-based-redis-driver/22455) | [2019-06-09](https://forums.swift.org/t/feedback-redisnio-a-nio-based-redis-driver/25521) | [2019-06-27](https://forums.swift.org/t/june-27th-2019/26580) |
106106

107-
## Language and Platform Test Matrix
107+
## Language and Platform Support
108+
109+
**RediStack** will always support the latest version of Swift on a given platform, plus **2** previous versions.
110+
111+
This policy is to balance the desire for as much backwards compatibility as possible, while also being able to take advantage of new Swift features for the best API design possible.
112+
113+
The oldest version of Swift will be dropped within **3 months** of an official release of a new version of Swift.
108114

109115
The following table shows the combination of Swift language versions and operating systems that
110116
receive regular unit testing (either in development, or with CI).
111117

112-
| Platform | Swift 5 | 5.1 | 5.2 | Trunk |
118+
| Platform | Swift 5.1 | 5.2 | 5.3 | Trunk |
113119
|:---------|:-------:|:---:|:---:|:-----:|
114120
| macOS Latest | | | :white_check_mark: | |
121+
| Ubuntu 20.04 (Focal) | | :white_check_mark: | | :white_check_mark: |
115122
| Ubuntu 18.04 (Bionic) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
116123
| Ubuntu 16.04 (Xenial) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
124+
| Amazon Linux 2 | | :white_check_mark: | | :white_check_mark: |
125+
| CentOS 8 | | :white_check_mark: | | :white_check_mark: |
117126

118127
## License
119128

Tests/LinuxMain.swift

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1 @@
1-
import XCTest
2-
3-
import RediStackIntegrationTests
4-
import RediStackTests
5-
6-
var tests = [XCTestCaseEntry]()
7-
tests += RediStackIntegrationTests.__allTests()
8-
tests += RediStackTests.__allTests()
9-
10-
XCTMain(tests)
1+
#error("Run the test suite with 'swift test --enable-test-discovery'")

Tests/RediStackIntegrationTests/XCTestManifests.swift

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

0 commit comments

Comments
 (0)