Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ jobs:
name: Unit tests
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
with:
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"
linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
name: Unit tests
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
with:
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"
linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
Expand Down
2 changes: 1 addition & 1 deletion FuzzTesting/Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.3
// swift-tools-version:6.0
//===----------------------------------------------------------------------===//
//
// This source file is part of the SwiftNIO open source project
Expand Down
23 changes: 0 additions & 23 deletions IntegrationTests/tests_01_allocation_counters/Thresholds/5.10.json

This file was deleted.

32 changes: 8 additions & 24 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.10
// swift-tools-version:6.0
//===----------------------------------------------------------------------===//
//
// This source file is part of the SwiftNIO open source project
Expand All @@ -15,23 +15,7 @@

import PackageDescription

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(["-require-explicit-sendable", "-warnings-as-errors"]))
}

return initialSettings
}()
let swiftSettings: [SwiftSetting] = []

let package = Package(
name: "swift-nio-http2",
Expand All @@ -51,7 +35,7 @@ let package = Package(
.product(name: "NIOPosix", package: "swift-nio"),
.product(name: "NIOHTTP1", package: "swift-nio"),
],
swiftSettings: strictConcurrencySettings
swiftSettings: swiftSettings
),
.executableTarget(
name: "NIOHTTP2PerformanceTester",
Expand All @@ -61,7 +45,7 @@ let package = Package(
.product(name: "NIOPosix", package: "swift-nio"),
.product(name: "NIOEmbedded", package: "swift-nio"),
],
swiftSettings: strictConcurrencySettings
swiftSettings: swiftSettings
),
.target(
name: "NIOHTTP2",
Expand All @@ -74,7 +58,7 @@ let package = Package(
.product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
.product(name: "Atomics", package: "swift-atomics"),
],
swiftSettings: strictConcurrencySettings
swiftSettings: swiftSettings
),
.target(
name: "NIOHPACK",
Expand All @@ -84,7 +68,7 @@ let package = Package(
.product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
.product(name: "NIOHTTP1", package: "swift-nio"),
],
swiftSettings: strictConcurrencySettings
swiftSettings: swiftSettings
),
.testTarget(
name: "NIOHTTP2Tests",
Expand All @@ -97,7 +81,7 @@ let package = Package(
.product(name: "NIOFoundationCompat", package: "swift-nio"),
.product(name: "Atomics", package: "swift-atomics"),
],
swiftSettings: strictConcurrencySettings
swiftSettings: swiftSettings
),
.testTarget(
name: "NIOHPACKTests",
Expand All @@ -110,7 +94,7 @@ let package = Package(
.copy("Fixtures/large_complex_huffman_b64.txt"),
.copy("Fixtures/large_huffman_b64.txt"),
],
swiftSettings: strictConcurrencySettings
swiftSettings: swiftSettings
),
]
)
Expand Down
Loading