Skip to content

Rename config trait from SwiftConfiguration to Configuration #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FranzBusch merged 2 commits into from
Feb 19, 2026
Merged

Rename config trait from SwiftConfiguration to Configuration #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
458949b
Rename config trait from SwiftConfiguration to Configuration
czechboy0 Feb 18, 2026
5837570
Merge branch 'main' into hd-rename-config-trait
czechboy0 Feb 19, 2026
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ let package = Package(
.library(name: "HTTPClientConformance", targets: ["HTTPClientConformance"]),
],
traits: [
.trait(name: "SwiftConfiguration"),
.default(enabledTraits: ["SwiftConfiguration"]),
.trait(name: "Configuration"),
.default(enabledTraits: ["Configuration"]),
Comment on lines +28 to +29
Copy link
Member

@FranzBusch FranzBusch Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This trait should really not be here since it is just for vending the copied server.

Copy link
Contributor Author

@czechboy0 czechboy0 Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You think the trait should be removed? Could that be done separately from fixing the name?

],
dependencies: [
.package(
Expand Down Expand Up @@ -124,7 +124,7 @@ let package = Package(
.product(
name: "Configuration",
package: "swift-configuration",
condition: .when(traits: ["SwiftConfiguration"])
condition: .when(traits: ["Configuration"])
),
],
swiftSettings: extraSettings
Expand Down
4 changes: 2 additions & 2 deletions Sources/HTTPClientConformance/HTTPServerForTesting/NIOHTTPServer+SwiftConfiguration.swift
View file
Open in desktop
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
Loading