Skip to content

Don't require objc in modulemaps generated for Swift compatibility headers #616

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 1 commit into from
Jun 30, 2025
Merged

Don't require objc in modulemaps generated for Swift compatibility headers #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Sources/SWBTaskConstruction/TaskProducers/OtherTaskProducers/ModuleMapTaskProducer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@ final class ModuleMapTaskProducer: PhasedTaskProducer, TaskProducer {
outputStream <<< "module \(try moduleName.asModuleIdentifierString()).Swift {\n"
}
outputStream <<< " header \"\(interfaceHeaderName.asCStringLiteralContent)\"\n"
outputStream <<< " requires objc\n"
outputStream <<< "}\n"

return outputStream.bytes
Expand Down
3 changes: 0 additions & 3 deletions Tests/SWBTaskConstructionTests/ModuleMapTaskConstructionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
#expect(contents == (OutputByteStream()
<<< "framework module SwiftOnly {\n"
<<< " header \"SwiftOnly-Swift.h\"\n"
<<< " requires objc\n"
<<< "}\n").bytes)
}

Expand Down Expand Up @@ -629,7 +628,6 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
<<< "\n"
<<< "module ObjCCompatibilityHeader.Swift {\n"
<<< " header \"ObjCCompatibilityHeader-Swift.h\"\n"
<<< " requires objc\n"
<<< "}\n").bytes)
}

Expand Down Expand Up @@ -978,7 +976,6 @@ fileprivate struct ModuleMapTaskConstructionTests: CoreBasedTests {
<<< "\n"
<<< "module \(targetName).Swift {\n"
<<< " header \"\(targetName)-Swift.h\"\n"
<<< " requires objc\n"
<<< "}\n").bytes)
}

Expand Down
2 changes: 0 additions & 2 deletions Tests/SWBTaskConstructionTests/SwiftTaskConstructionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,6 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
#expect(contents == (OutputByteStream()
<<< "framework module CoreFoo {\n"
<<< " header \"CoreFoo-Swift.h\"\n"
<<< " requires objc\n"
<<< "}\n").bytes)
}
}
Expand Down Expand Up @@ -1086,7 +1085,6 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
stream <<< "\n"
stream <<< "module CoreFoo.Swift {\n"
stream <<< " header \"CoreFoo-Swift.h\"\n"
stream <<< " requires objc\n"
stream <<< "}\n"
#expect(contents == stream.bytes)

Expand Down
Loading