diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8a30168..1de7a8c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,19 +15,16 @@ jobs: uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: linux_5_10_enabled: false - linux_6_0_arguments_override: "--explicit-target-dependency-import-check error" linux_6_1_arguments_override: "--explicit-target-dependency-import-check error" linux_6_2_arguments_override: "--explicit-target-dependency-import-check error" linux_6_3_arguments_override: "--explicit-target-dependency-import-check error" linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error" linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error" - windows_6_0_enabled: true windows_6_1_enabled: true windows_6_2_enabled: true windows_6_3_enabled: true windows_nightly_next_enabled: true windows_nightly_main_enabled: true - windows_6_0_arguments_override: "--explicit-target-dependency-import-check error" windows_6_1_arguments_override: "--explicit-target-dependency-import-check error" windows_6_2_arguments_override: "--explicit-target-dependency-import-check error" windows_6_3_arguments_override: "--explicit-target-dependency-import-check error" @@ -80,7 +77,6 @@ jobs: name: Release builds uses: apple/swift-nio/.github/workflows/release_builds.yml@main with: - windows_6_0_enabled: true windows_6_1_enabled: true windows_6_2_enabled: true windows_6_3_enabled: true diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c0e8323..655d817 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -19,19 +19,16 @@ jobs: uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: linux_5_10_enabled: false - linux_6_0_arguments_override: "--explicit-target-dependency-import-check error" linux_6_1_arguments_override: "--explicit-target-dependency-import-check error" linux_6_2_arguments_override: "--explicit-target-dependency-import-check error" linux_6_3_arguments_override: "--explicit-target-dependency-import-check error" linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error" linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error" - windows_6_0_enabled: true windows_6_1_enabled: true windows_6_2_enabled: true windows_6_3_enabled: true windows_nightly_next_enabled: true windows_nightly_main_enabled: true - windows_6_0_arguments_override: "--explicit-target-dependency-import-check error" windows_6_1_arguments_override: "--explicit-target-dependency-import-check error" windows_6_2_arguments_override: "--explicit-target-dependency-import-check error" windows_6_3_arguments_override: "--explicit-target-dependency-import-check error" @@ -84,7 +81,6 @@ jobs: name: Release builds uses: apple/swift-nio/.github/workflows/release_builds.yml@main with: - windows_6_0_enabled: true windows_6_1_enabled: true windows_6_2_enabled: true windows_6_3_enabled: true diff --git a/Benchmarks/Package.swift b/Benchmarks/Package.swift index fd23dcf..918ad78 100644 --- a/Benchmarks/Package.swift +++ b/Benchmarks/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 6.0 +// swift-tools-version:6.1 import PackageDescription let package = Package( diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift deleted file mode 100644 index 747169c..0000000 --- a/Package@swift-6.0.swift +++ /dev/null @@ -1,71 +0,0 @@ -// swift-tools-version: 6.0 -//===----------------------------------------------------------------------===// -// -// This source file is part of the SwiftOpenAPIGenerator open source project -// -// Copyright (c) 2023 Apple Inc. and the SwiftOpenAPIGenerator project authors -// Licensed under Apache License v2.0 -// -// See LICENSE.txt for license information -// See CONTRIBUTORS.txt for the list of SwiftOpenAPIGenerator project authors -// -// SPDX-License-Identifier: Apache-2.0 -// -//===----------------------------------------------------------------------===// -import PackageDescription - -// General Swift-settings for all targets. -let swiftSettings: [SwiftSetting] = [ - // https://github.com/apple/swift-evolution/blob/main/proposals/0335-existential-any.md - // Require `any` for existential types. - .enableUpcomingFeature("ExistentialAny"), - - // Used to fake the trait on Swift 6.0 - .define("FullFoundation") -] - -let package = Package( - name: "swift-openapi-runtime", - platforms: [ - .macOS(.v10_15), .macCatalyst(.v13), .iOS(.v13), .tvOS(.v13), .watchOS(.v6), .visionOS(.v1) - ], - products: [ - .library( - name: "OpenAPIRuntime", - targets: ["OpenAPIRuntime"] - ) - ], - dependencies: [ - .package(url: "https://github.com/apple/swift-http-types", from: "1.0.0"), - ], - targets: [ - .target( - name: "OpenAPIRuntime", - dependencies: [ - .product(name: "HTTPTypes", package: "swift-http-types") - ], - swiftSettings: swiftSettings - ), - .testTarget( - name: "OpenAPIRuntimeTests", - dependencies: ["OpenAPIRuntime"], - swiftSettings: swiftSettings - ), - ] -) - -for target in package.targets { - var settings = target.swiftSettings ?? [] - - // https://github.com/apple/swift-evolution/blob/main/proposals/0335-existential-any.md - // Require `any` for existential types. - settings.append(.enableUpcomingFeature("ExistentialAny")) - - // https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md - settings.append(.enableUpcomingFeature("MemberImportVisibility")) - - // https://github.com/swiftlang/swift-evolution/blob/main/proposals/0409-access-level-on-imports.md - settings.append(.enableUpcomingFeature("InternalImportsByDefault")) - - target.swiftSettings = settings -} diff --git a/Sources/OpenAPIRuntime/Multipart/MultipartFramesToRawPartsSequence.swift b/Sources/OpenAPIRuntime/Multipart/MultipartFramesToRawPartsSequence.swift index 2f426dc..c3bfb7d 100644 --- a/Sources/OpenAPIRuntime/Multipart/MultipartFramesToRawPartsSequence.swift +++ b/Sources/OpenAPIRuntime/Multipart/MultipartFramesToRawPartsSequence.swift @@ -348,7 +348,6 @@ extension MultipartFramesToRawPartsSequence { case .fetchFrame: let frame: Upstream.AsyncIterator.Element? var upstream = upstream - #if compiler(>=6.0) if #available(macOS 15, iOS 18.0, tvOS 18.0, watchOS 11.0, macCatalyst 18.0, visionOS 2.0, *) { frame = try await upstream.next(isolation: self) } else { @@ -356,9 +355,6 @@ extension MultipartFramesToRawPartsSequence { frame = try await unsafeUpstream.next() upstream = unsafeUpstream } - #else - frame = try await upstream.next() - #endif self.upstream = upstream switch stateMachine.partReceivedFrame(frame) { case .returnNil: return nil @@ -382,7 +378,6 @@ extension MultipartFramesToRawPartsSequence { case .fetchFrame: let frame: Upstream.AsyncIterator.Element? var upstream = upstream - #if compiler(>=6.0) if #available(macOS 15, iOS 18.0, tvOS 18.0, watchOS 11.0, macCatalyst 18.0, visionOS 2.0, *) { frame = try await upstream.next(isolation: self) } else { @@ -390,9 +385,6 @@ extension MultipartFramesToRawPartsSequence { frame = try await unsafeUpstream.next() upstream = unsafeUpstream } - #else - frame = try await upstream.next() - #endif self.upstream = upstream switch stateMachine.bodyReceivedFrame(frame) { case .returnNil: return nil