Disable traits for imported runtime

.licenseignore

@@ -11,6 +11,7 @@ CONTRIBUTORS.txt
 LICENSE.txt
 NOTICE.txt
 Package.swift
+Package@swift-*.swift
 Package.resolved
 README.md
 SECURITY.md
@@ -21,6 +22,7 @@ docker/*
 **/*.docc/*
 **/.gitignore
 **/Package.swift
+**/Package@-*.swift
 **/Package.resolved
 **/README.md
 **/openapi.yaml

.swiftformatignore

@@ -4,3 +4,5 @@ Examples/**/Generated/*
 Examples/**/GeneratedSources/*
 Examples/streaming-chatgpt-proxy/**
 **Package.swift
+**Package@-*.swift
+**Package@swift-*.swift

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.10
+// swift-tools-version:6.1
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the SwiftOpenAPIGenerator open source project
@@ -20,6 +20,7 @@ var swiftSettings: [SwiftSetting] = [
     // https://github.com/apple/swift-evolution/blob/main/proposals/0335-existential-any.md
     // Require `any` for existential types.
     .enableUpcomingFeature("ExistentialAny"), .enableExperimentalFeature("StrictConcurrency=complete"),
+    .swiftLanguageMode(.v5),
 ]
 
 let package = Package(
@@ -54,7 +55,7 @@ let package = Package(
         // Tests-only: Runtime library linked by generated code, and also
         // helps keep the runtime library new enough to work with the generated
         // code.
-        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.8.2"),
+        .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.2"),
     ],
     targets: [

Package@swift-5.10.swift

@@ -0,0 +1,167 @@
+// swift-tools-version:5.10
+//===----------------------------------------------------------------------===//
+//
+// 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.
+var swiftSettings: [SwiftSetting] = [
+    // https://github.com/apple/swift-evolution/blob/main/proposals/0335-existential-any.md
+    // Require `any` for existential types.
+    .enableUpcomingFeature("ExistentialAny"), .enableExperimentalFeature("StrictConcurrency=complete"),
+]
+
+let package = Package(
+    name: "swift-openapi-generator",
+    platforms: [
+        .macOS(.v10_15),
+
+        // The platforms below are not currently supported for running
+        // the generator itself. We include them here to allow the generator
+        // to emit a more descriptive compiler error.
+        .iOS(.v13), .tvOS(.v13), .watchOS(.v6), .visionOS(.v1),
+    ],
+    products: [
+        .executable(name: "swift-openapi-generator", targets: ["swift-openapi-generator"]),
+        .plugin(name: "OpenAPIGenerator", targets: ["OpenAPIGenerator"]),
+        .plugin(name: "OpenAPIGeneratorCommand", targets: ["OpenAPIGeneratorCommand"]),
+        .library(name: "_OpenAPIGeneratorCore", targets: ["_OpenAPIGeneratorCore"]),
+    ],
+    dependencies: [
+
+        // General algorithms
+        .package(url: "https://github.com/apple/swift-algorithms", from: "1.2.0"),
+        .package(url: "https://github.com/apple/swift-collections", from: "1.1.4"),
+
+        // Read OpenAPI documents
+        .package(url: "https://github.com/mattpolzin/OpenAPIKit", from: "3.9.0"),
+        .package(url: "https://github.com/jpsim/Yams", "4.0.0"..<"7.0.0"),
+
+        // CLI Tool
+        .package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.0"),
+
+        // Tests-only: Runtime library linked by generated code, and also
+        // helps keep the runtime library new enough to work with the generated
+        // code.
+        .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.11.0"),
+        .package(url: "https://github.com/apple/swift-http-types", from: "1.0.2"),
+    ],
+    targets: [
+
+        // Generator Core
+        .target(
+            name: "_OpenAPIGeneratorCore",
+            dependencies: [
+                .product(name: "OpenAPIKit", package: "OpenAPIKit"),
+                .product(name: "OpenAPIKit30", package: "OpenAPIKit"),
+                .product(name: "OpenAPIKitCompat", package: "OpenAPIKit"),
+                .product(name: "Algorithms", package: "swift-algorithms"),
+                .product(name: "OrderedCollections", package: "swift-collections"),
+                .product(name: "Yams", package: "Yams"),
+            ],
+            swiftSettings: swiftSettings
+        ),
+
+        // Generator Core Tests
+        .testTarget(
+            name: "OpenAPIGeneratorCoreTests",
+            dependencies: ["_OpenAPIGeneratorCore"],
+            swiftSettings: swiftSettings
+        ),
+
+        // GeneratorReferenceTests
+        .testTarget(
+            name: "OpenAPIGeneratorReferenceTests",
+            dependencies: ["_OpenAPIGeneratorCore"],
+            resources: [.copy("Resources")],
+            swiftSettings: swiftSettings
+        ),
+
+        // Common types for concrete PetstoreConsumer*Tests test targets.
+        .target(
+            name: "PetstoreConsumerTestCore",
+            dependencies: [
+                .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
+                .product(name: "HTTPTypes", package: "swift-http-types"),
+            ],
+            swiftSettings: swiftSettings
+        ),
+
+        // PetstoreConsumerTests
+        // Builds and tests the reference code from GeneratorReferenceTests
+        // to ensure it actually works correctly at runtime.
+        .testTarget(
+            name: "PetstoreConsumerTests",
+            dependencies: ["PetstoreConsumerTestCore"],
+            swiftSettings: swiftSettings
+        ),
+
+        // Test Target for swift-openapi-generator
+        .testTarget(
+            name: "OpenAPIGeneratorTests",
+            dependencies: [
+                "_OpenAPIGeneratorCore",
+                // Everything except windows: https://github.com/swiftlang/swift-package-manager/issues/6367
+                .target(
+                    name: "swift-openapi-generator",
+                    condition: .when(platforms: [.android, .linux, .macOS, .openbsd, .wasi, .custom("freebsd")])
+                ), .product(name: "ArgumentParser", package: "swift-argument-parser"),
+            ],
+            resources: [.copy("Resources")],
+            swiftSettings: swiftSettings
+        ),
+
+        // Generator CLI
+        .executableTarget(
+            name: "swift-openapi-generator",
+            dependencies: [
+                "_OpenAPIGeneratorCore", .product(name: "ArgumentParser", package: "swift-argument-parser"),
+            ],
+            swiftSettings: swiftSettings
+        ),
+
+        // Build Plugin
+        .plugin(name: "OpenAPIGenerator", capability: .buildTool(), dependencies: ["swift-openapi-generator"]),
+
+        // Command Plugin
+        .plugin(
+            name: "OpenAPIGeneratorCommand",
+            capability: .command(
+                intent: .custom(
+                    verb: "generate-code-from-openapi",
+                    description: "Generate Swift code from an OpenAPI document."
+                ),
+                permissions: [
+                    .writeToPackageDirectory(
+                        reason: "To write the generated Swift files back into the source directory of the package."
+                    )
+                ]
+            ),
+            dependencies: ["swift-openapi-generator"]
+        ),
+    ]
+)
+
+// ---    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 --- //

Plugins/PluginsShared/PluginError.swift

@@ -77,7 +77,9 @@ struct FileError: Swift.Error, Equatable, CustomStringConvertible, LocalizedErro
         /// File wasn't found.
         case noFilesFound
         /// More than 1 file found.
-        case multipleFilesFound(files: [Path])
+        case multipleFilesFound(files: [String])
+
+        static func multipleFilesFound(files: [Path]) -> Self { .multipleFilesFound(files: files.map(\.description)) }
 
         /// The error is definitely due to misconfiguration of a target.
         var isMisconfigurationError: Bool {