Skip to content

Lock in strict concurrency adoption #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 11, 2025
Merged

Lock in strict concurrency adoption #530

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
044f27e
Lock in strict concurrency adoption
Lukasa Feb 5, 2025
1b99e67
Update Package.swift
Lukasa Apr 11, 2025
68d8278
Development isn't true
Lukasa Apr 11, 2025
538ffe2
Warnings as errors
Lukasa Apr 11, 2025
42a4a46
6.1 benchmarks
Lukasa Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
name: Unit tests
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
with:
linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"

Expand Down
35 changes: 29 additions & 6 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import class Foundation.ProcessInfo
func generateDependencies() -> [Package.Dependency] {
if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
return [
.package(url: "https://github.com/apple/swift-nio.git", from: "2.54.0")
.package(url: "https://github.com/apple/swift-nio.git", from: "2.80.0")
]
} else {
return [
Expand All @@ -54,6 +54,24 @@ let includePrivacyManifest = true
let includePrivacyManifest = false
#endif

let strictConcurrencyDevelopment = false

let strictConcurrencySettings: [SwiftSetting] = {
var initialSettings: [SwiftSetting] = []
initialSettings.append(contentsOf: [
.enableUpcomingFeature("StrictConcurrency"),
.enableUpcomingFeature("InferSendableFromCaptures"),
])

if strictConcurrencyDevelopment {
// -warnings-as-errors here is a workaround so that IDE-based development can
// get tripped up on -require-explicit-sendable.
initialSettings.append(.unsafeFlags(["-Xfrontend", "-require-explicit-sendable", "-warnings-as-errors"]))
}

return initialSettings
}()

// swift-format-ignore: NoBlockComments
let package = Package(
name: "swift-nio-ssl",
Expand Down Expand Up @@ -95,7 +113,8 @@ let package = Package(
.product(name: "NIOTLS", package: "swift-nio"),
],
exclude: includePrivacyManifest ? [] : ["PrivacyInfo.xcprivacy"],
resources: includePrivacyManifest ? [.copy("PrivacyInfo.xcprivacy")] : []
resources: includePrivacyManifest ? [.copy("PrivacyInfo.xcprivacy")] : [],
swiftSettings: strictConcurrencySettings
),
.executableTarget(
name: "NIOTLSServer",
Expand All @@ -107,7 +126,8 @@ let package = Package(
],
exclude: [
"README.md"
]
],
swiftSettings: strictConcurrencySettings
),
.executableTarget(
name: "NIOSSLHTTP1Client",
Expand All @@ -120,7 +140,8 @@ let package = Package(
],
exclude: [
"README.md"
]
],
swiftSettings: strictConcurrencySettings
),
.executableTarget(
name: "NIOSSLPerformanceTester",
Expand All @@ -129,7 +150,8 @@ let package = Package(
.product(name: "NIOCore", package: "swift-nio"),
.product(name: "NIOEmbedded", package: "swift-nio"),
.product(name: "NIOTLS", package: "swift-nio"),
]
],
swiftSettings: strictConcurrencySettings
),
.testTarget(
name: "NIOSSLTests",
Expand All @@ -139,7 +161,8 @@ let package = Package(
.product(name: "NIOEmbedded", package: "swift-nio"),
.product(name: "NIOPosix", package: "swift-nio"),
.product(name: "NIOTLS", package: "swift-nio"),
]
],
swiftSettings: strictConcurrencySettings
),
],
cxxLanguageStandard: .cxx17
Expand Down
Loading