Skip to content

Commit 5214325

Browse files
Drop Swift 5.10 (#46)
### Motivation: Swift 5.10 is no longer supported, we should bump the swift-tools version. ### Modifications: * Update Swift tools version to 6.0 ### Result: Code reflects our support window.
1 parent bc14225 commit 5214325

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

Package.swift

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.10
1+
// swift-tools-version:6.0
22
//===----------------------------------------------------------------------===//
33
//
44
// This source file is part of the SwiftNIO open source project
@@ -19,10 +19,6 @@ let strictConcurrencyDevelopment = false
1919

2020
let strictConcurrencySettings: [SwiftSetting] = {
2121
var initialSettings: [SwiftSetting] = []
22-
initialSettings.append(contentsOf: [
23-
.enableUpcomingFeature("StrictConcurrency"),
24-
.enableUpcomingFeature("InferSendableFromCaptures"),
25-
])
2622

2723
if strictConcurrencyDevelopment {
2824
// -warnings-as-errors here is a workaround so that IDE-based development can
@@ -88,7 +84,8 @@ let package = Package(
8884
name: "ObliviousXHelpers",
8985
dependencies: [
9086
.product(name: "Crypto", package: "swift-crypto")
91-
]
87+
],
88+
swiftSettings: strictConcurrencySettings
9289
),
9390
.testTarget(
9491
name: "ObliviousHTTPTests",

Sources/ObliviousDoH/ODoHRoutine.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public enum ODoH: Sendable {
8989
///
9090
/// Contains common functionality for both client and server ODoH operations.
9191
/// Initialized with a configuration containing the target's public key and algorithm parameters.
92-
internal struct RoutineCore {
92+
internal struct RoutineCore: Sendable {
9393
internal var ct: HPKE.Ciphersuite
9494
internal var pkR: any HPKEDiffieHellmanPublicKey
9595
internal var keyID: Data
@@ -178,7 +178,7 @@ public enum ODoH: Sendable {
178178
///
179179
/// Handles the client-side cryptographic operations for Oblivious DNS over HTTPS.
180180
/// Initialized with a configuration containing the target's public key and algorithm parameters.
181-
public struct ClientRoutine {
181+
public struct ClientRoutine: Sendable {
182182
private var core: RoutineCore
183183

184184
/// Initialize ODoH client routine with target server configuration.
@@ -345,7 +345,7 @@ public enum ODoH: Sendable {
345345
///
346346
/// Handles the server-side cryptographic operations for Oblivious DNS over HTTPS.
347347
/// Initialized with a configuration containing the server's public key and algorithm parameters.
348-
public struct ServerRoutine {
348+
public struct ServerRoutine: Sendable {
349349
private var core: RoutineCore
350350

351351
/// Initialize ODoH server routine with server configuration.

0 commit comments

Comments
 (0)