From c16a172222c89d48a95456dd0be5b79c20d5aaa9 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Fri, 7 Mar 2025 13:16:22 +0000 Subject: [PATCH 1/2] Only apply standard swift settings on valid targets --- Package.swift | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/Package.swift b/Package.swift index 0d6222aa..55e70748 100644 --- a/Package.swift +++ b/Package.swift @@ -23,41 +23,27 @@ let swiftSettings: [SwiftSetting] = [ 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"), - ], + 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"], + dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")], swiftSettings: swiftSettings - ), + ), .testTarget(name: "OpenAPIRuntimeTests", dependencies: ["OpenAPIRuntime"], swiftSettings: swiftSettings), ] ) // --- STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- // for target in package.targets { - if target.type != .plugin { + 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 --- // +}// --- END: STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- // From f5c1b7491af3c3cbed681ee927edea9cb9daa920 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Fri, 7 Mar 2025 13:22:13 +0000 Subject: [PATCH 2/2] Undo formatting changes --- Package.swift | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index 55e70748..58fc1d4d 100644 --- a/Package.swift +++ b/Package.swift @@ -23,15 +23,31 @@ let swiftSettings: [SwiftSetting] = [ 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")], + 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")], + dependencies: [ + .product(name: "HTTPTypes", package: "swift-http-types") + ], + swiftSettings: swiftSettings + ), + .testTarget( + name: "OpenAPIRuntimeTests", + dependencies: ["OpenAPIRuntime"], swiftSettings: swiftSettings - ), .testTarget(name: "OpenAPIRuntimeTests", dependencies: ["OpenAPIRuntime"], swiftSettings: swiftSettings), + ), ] ) @@ -46,4 +62,5 @@ for target in package.targets { 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 --- // +} +// --- END: STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- //