Move to FoundationEssentials (#59)

Uses `FoundationEssentials` instead of `Foundation`. Also removes
`NIOFoundationCompat`, because it did appear to be used, and that pulled
in the entire Foundation.

Also disabled the default traits for the `OpenAPIRuntime` to prevent
linking Foundation.
This commit is contained in:
Mads Odgaard
2026-03-06 18:55:32 +01:00
committed by GitHub
parent 502e303d73
commit 5ee8f2dd51
5 changed files with 75 additions and 10 deletions
+2
View File
@@ -18,7 +18,9 @@
Package.swift
**/Package.swift
Package@-*.swift
Package@swift-*.swift
**/Package@-*.swift
**/Package@swift-*.swift
Package.resolved
**/Package.resolved
Makefile
+1
View File
@@ -1 +1,2 @@
**Package.swift
**Package@swift-*.swift
+2 -3
View File
@@ -1,4 +1,4 @@
// swift-tools-version:6.0
// swift-tools-version:6.1
//===----------------------------------------------------------------------===//
//
// This source file is part of the SwiftOpenAPIGenerator open source project
@@ -29,7 +29,7 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/apple/swift-nio", from: "2.58.0"),
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.11.0", traits: []),
.package(url: "https://github.com/apple/swift-http-types", from: "1.0.0"),
],
targets: [
@@ -39,7 +39,6 @@ let package = Package(
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
.product(name: "HTTPTypes", package: "swift-http-types"),
.product(name: "AsyncHTTPClient", package: "async-http-client"),
.product(name: "NIOFoundationCompat", package: "swift-nio"),
],
swiftSettings: swiftSettings
),
+64
View File
@@ -0,0 +1,64 @@
// 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 Foundation
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")
]
let package = Package(
name: "swift-openapi-async-http-client",
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6), .visionOS(.v1)],
products: [.library(name: "OpenAPIAsyncHTTPClient", targets: ["OpenAPIAsyncHTTPClient"])],
dependencies: [
.package(url: "https://github.com/apple/swift-nio", from: "2.58.0"),
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-http-types", from: "1.0.0"),
],
targets: [
.target(
name: "OpenAPIAsyncHTTPClient",
dependencies: [
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
.product(name: "HTTPTypes", package: "swift-http-types"),
.product(name: "AsyncHTTPClient", package: "async-http-client"),
],
swiftSettings: swiftSettings
),
.testTarget(
name: "OpenAPIAsyncHTTPClientTests",
dependencies: ["OpenAPIAsyncHTTPClient"],
swiftSettings: swiftSettings
),
]
)
// --- STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- //
for target in package.targets {
switch target.type {
case .regular, .test, .executable:
var settings = target.swiftSettings ?? []
// https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md
settings.append(.enableUpcomingFeature("MemberImportVisibility"))
target.swiftSettings = settings
case .macro, .plugin, .system, .binary: () // not applicable
@unknown default: () // we don't know what to do here, do nothing
}
}// --- END: STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- //
@@ -15,15 +15,14 @@ import OpenAPIRuntime
import AsyncHTTPClient
import NIOCore
import NIOHTTP1
import NIOFoundationCompat
import HTTPTypes
#if canImport(Darwin)
import Foundation
#if canImport(FoundationEssentials)
@preconcurrency import struct FoundationEssentials.URL
import struct FoundationEssentials.URLComponents
import struct FoundationEssentials.Data
import protocol FoundationEssentials.LocalizedError
#else
@preconcurrency import struct Foundation.URL
import struct Foundation.URLComponents
import struct Foundation.Data
import protocol Foundation.LocalizedError
import Foundation
#endif
/// A client transport that performs HTTP operations using the HTTPClient type