Skip to content

[WITExtractor] Stop including per-config build directory for Swift 6.0+ #185

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
merged 2 commits into from
Jun 11, 2025
Merged

[WITExtractor] Stop including per-config build directory for Swift 6.0+ #185

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
8799b42
[WITExtractor] Stop including per-config build directory for Swift 6.0+
kateinoigakukun Jun 11, 2025
a9bb45e
CI: Re-enable WITExtractorPluginTests on nightly
kateinoigakukun Jun 11, 2025
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
11 changes: 8 additions & 3 deletions Plugins/WITExtractorPlugin/Plugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,16 @@ struct Plugin: CommandPlugin {
"--package-name", context.package.displayName,
"--wit-output-path", witOutputPath.string,
"--swift-output-path", swiftOutputPath.string,
"-I", buildPath.string,
// SwiftPM 6.0 and later emits swiftmodule files into a separate directory
// https://github.com/swiftlang/swift-package-manager/pull/7212
"-I", buildPath.appending(["Modules"]).string,
]

#if compiler(<6.0)
// Swift 5.10 and earlier emit module files under the per-configuration build directory
// instead of the Modules directory.
arguments += [
"-I", buildPath.string,
]
#endif
if let sdk {
arguments += ["-sdk", sdk]
}
Expand Down
3 changes: 0 additions & 3 deletions Tests/WITExtractorPluginTests/PluginSmokeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ import XCTest

class PluginSmokeTests: XCTestCase {
func testExtractPlugin() throws {
#if WASMKIT_CI_TOOLCHAIN_NIGHTLY
throw XCTSkip("XFAIL: https://github.com/swiftwasm/WasmKit/issues/184")
#endif
guard ProcessInfo.processInfo.environment["__XCODE_BUILT_PRODUCTS_DIR_PATHS"] == nil else {
throw XCTSkip(
"\"swift package resolve\" somehow fails to clone git repository only when invoking from Xcode test runner"
Expand Down