Skip to content

Commit dcb717f

Browse files
authored
Drop old Swift versions (#220)
* Drop 5.8 and 5.9 * Update CI
1 parent b452702 commit dcb717f

File tree

4 files changed

+17
-61
lines changed

4 files changed

+17
-61
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,9 @@ jobs:
5454
fail-fast: false
5555
matrix:
5656
container:
57-
- swift:5.8-focal
58-
- swift:5.9-jammy
5957
- swift:5.10-jammy
60-
- swiftlang/swift:nightly-6.0-jammy
58+
- swift:6.0-jammy
59+
- swift:6.1-jammy
6160
- swiftlang/swift:nightly-main-jammy
6261
redis:
6362
- redis:6

Package.swift

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
// swift-tools-version:5.8
1+
// swift-tools-version:5.10
22
import PackageDescription
33

44
let package = Package(
55
name: "redis",
66
platforms: [
7-
.macOS(.v10_15),
8-
.iOS(.v13),
9-
.tvOS(.v13),
10-
.watchOS(.v6),
7+
.macOS(.v10_15),
8+
.iOS(.v13),
9+
.tvOS(.v13),
10+
.watchOS(.v6),
1111
],
1212
products: [
1313
.library(name: "Redis", targets: ["Redis"])
@@ -22,11 +22,16 @@ let package = Package(
2222
dependencies: [
2323
.product(name: "RediStack", package: "RediStack"),
2424
.product(name: "Vapor", package: "vapor"),
25-
]
25+
],
26+
swiftSettings: [.enableExperimentalFeature("StrictConcurrency=complete")]
2627
),
27-
.testTarget(name: "RedisTests", dependencies: [
28-
.target(name: "Redis"),
29-
.product(name: "XCTVapor", package: "vapor"),
30-
])
28+
.testTarget(
29+
name: "RedisTests",
30+
dependencies: [
31+
.target(name: "Redis"),
32+
.product(name: "XCTVapor", package: "vapor"),
33+
],
34+
swiftSettings: [.enableExperimentalFeature("StrictConcurrency=complete")]
35+
)
3136
]
3237
)

Package@swift-5.9.swift

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

Sources/Redis/Exports.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
1-
#if swift(>=5.8)
2-
31
@_documentation(visibility: internal) @_exported import RediStack
42
@_documentation(visibility: internal) @_exported import struct Foundation.URL
53
@_documentation(visibility: internal) @_exported import struct Logging.Logger
64
@_documentation(visibility: internal) @_exported import struct NIO.TimeAmount
7-
8-
#else
9-
10-
@_exported import RediStack
11-
@_exported import struct Foundation.URL
12-
@_exported import struct Logging.Logger
13-
@_exported import struct NIO.TimeAmount
14-
15-
#endif

0 commit comments

Comments
 (0)