Skip to content

Commit b148491

Browse files
MordilMordil
committed
Set Swift 5.2 as the minimum version
1 parent 8bf26fb commit b148491

File tree

4 files changed

+51
-23
lines changed

4 files changed

+51
-23
lines changed

‎.gitlab/ci/ubuntu-bionic.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,3 @@ swift 5.3:
1212
swift 5.2:
1313
extends: .unit-test
1414
image: swift:5.2-bionic
15-
16-
swift 5.1:
17-
extends: .unit-test
18-
image: swift:5.1-bionic

‎.gitlab/ci/ubuntu-xenial.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,3 @@ swift 5.3:
1212
swift 5.2:
1313
extends: .unit-test
1414
image: swift:5.2-xenial
15-
16-
swift 5.1:
17-
extends: .unit-test
18-
image: swift:5.1-xenial

‎Package.swift

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.1
1+
// swift-tools-version:5.2
22
//===----------------------------------------------------------------------===//
33
//
44
// This source file is part of the RediStack open source project
@@ -28,11 +28,46 @@ let package = Package(
2828
.package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0")
2929
],
3030
targets: [
31-
.target(name: "RediStack", dependencies: ["NIO", "Logging", "Metrics"]),
31+
.target(
32+
name: "RediStack",
33+
dependencies: [
34+
.product(name: "NIO", package: "swift-nio"),
35+
.product(name: "Logging", package: "swift-log"),
36+
.product(name: "Metrics", package: "swift-metrics")
37+
]
38+
),
39+
.testTarget(
40+
name: "RediStackTests",
41+
dependencies: [
42+
"RediStack", "RediStackTestUtils",
43+
.product(name: "NIO", package: "swift-nio"),
44+
.product(name: "NIOTestUtils", package: "swift-nio")
45+
]
46+
),
47+
3248
.target(name: "RedisTypes", dependencies: ["RediStack"]),
33-
.target(name: "RediStackTestUtils", dependencies: ["NIO", "RediStack"]),
34-
.testTarget(name: "RediStackTests", dependencies: ["RediStack", "NIO", "RediStackTestUtils", "NIOTestUtils"]),
35-
.testTarget(name: "RedisTypesTests", dependencies: ["RediStack", "NIO", "RediStackTestUtils", "RedisTypes"]),
36-
.testTarget(name: "RediStackIntegrationTests", dependencies: ["RediStack", "NIO", "RediStackTestUtils"])
49+
.testTarget(
50+
name: "RedisTypesTests",
51+
dependencies: [
52+
"RediStack", "RedisTypes", "RediStackTestUtils",
53+
.product(name: "NIO", package: "swift-nio")
54+
]
55+
),
56+
57+
.target(
58+
name: "RediStackTestUtils",
59+
dependencies: [
60+
.product(name: "NIO", package: "swift-nio"),
61+
"RediStack"
62+
]
63+
),
64+
65+
.testTarget(
66+
name: "RediStackIntegrationTests",
67+
dependencies: [
68+
"RediStack", "RediStackTestUtils",
69+
.product(name: "NIO", package: "swift-nio")
70+
]
71+
)
3772
]
3873
)

‎README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ 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"` | 5.1+ | 3.x**¹** < 6.x | 2.x | 1.x | 1.x ..< 3.0 |
34+
| `from: "1.0.0"` | 5.1+ | 3.x**¹** ..< 6.x | 2.x | 1.x | 1.x ..< 3.0 |
35+
| `from: "2.0.0"` | 5.2+ | 3.x**¹** ... 6.x | 2.x | 1.x | 1.x ..< 3.0 |
3536

36-
> **¹** _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._
37+
> **¹** _Use of newer Redis features on older Redis versions is done at your own risk. See Redis' release notes for [v6](https://raw.githubusercontent.com/antirez/redis/6.0/00-RELEASENOTES), [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._
3738
3839
### Supported Operating Systems
3940

@@ -47,7 +48,7 @@ To install **RediStack**, just add the package as a dependency in your **Package
4748

4849
```swift
4950
dependencies: [
50-
.package(url: "https://gitlab.com/mordil/RediStack.git", from: "1.0.0")
51+
.package(url: "https://gitlab.com/mordil/RediStack.git", from: "2.0.0")
5152
]
5253
```
5354

@@ -117,15 +118,15 @@ This policy is to balance the desire for as much backwards compatibility as poss
117118
The following table shows the combination of Swift language versions and operating systems that
118119
receive regular unit testing (either in development, or with CI).
119120

120-
| Platform | Swift 5.1 | 5.2 | 5.3 | Trunk |
121+
| Platform | Swift 5.2 | 5.3 | 5.4 | Trunk |
121122
|:----------------------|:------------------:|:------------------:|:------------------:|:------------------:|
122-
| macOS Latest (Intel) | | | :white_check_mark: | |
123-
| Ubuntu 20.04 (Focal) | | :white_check_mark: | :white_check_mark: | :white_check_mark: |
123+
| macOS Latest (Intel) | | :white_check_mark: | | |
124+
| Ubuntu 20.04 (Focal) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
124125
| Ubuntu 18.04 (Bionic) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
125126
| Ubuntu 16.04 (Xenial) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
126-
| Amazon Linux 2 | | :white_check_mark: | :white_check_mark: | :white_check_mark: |
127-
| CentOS 7 | | :white_check_mark: | :white_check_mark: | :white_check_mark: |
128-
| CentOS 8 | | :white_check_mark: | :white_check_mark: | :white_check_mark: |
127+
| Amazon Linux 2 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
128+
| CentOS 7 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
129+
| CentOS 8 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
129130

130131
## License
131132

0 commit comments

Comments
 (0)