Skip to content
Merged
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
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ let package = Package(
)
],
traits: [
.trait(name: "SwiftConfiguration"),
.default(enabledTraits: ["SwiftConfiguration"]),
.trait(name: "Configuration"),
.default(enabledTraits: ["Configuration"]),
],
dependencies: [
.package(url: "https://github.com/apple/swift-http-api-proposal", branch: "main"),
Expand Down Expand Up @@ -89,7 +89,7 @@ let package = Package(
.product(
name: "Configuration",
package: "swift-configuration",
condition: .when(traits: ["SwiftConfiguration"])
condition: .when(traits: ["Configuration"])
),
.product(name: "HTTPServer", package: "swift-http-api-proposal"),
],
Expand Down
4 changes: 2 additions & 2 deletions Sources/NIOHTTPServer/NIOHTTPServer+SwiftConfiguration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

#if SwiftConfiguration
#if Configuration
public import Configuration
import NIOCertificateReloading
import SwiftASN1
Expand Down Expand Up @@ -343,4 +343,4 @@ extension CertificateVerificationMode {
}
}
}
#endif // SwiftConfiguration
#endif // Configuration
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

#if SwiftConfiguration
#if Configuration
import Configuration
import Crypto
import Foundation
Expand Down Expand Up @@ -483,4 +483,4 @@ struct NIOHTTPServerSwiftConfigurationTests {
}
}
}
#endif // SwiftConfiguration
#endif // Configuration
Loading