Propagate swift version / copts #85
Conversation
|
@rahul-malik - Awesome! This seems to be causing a CI issue: It's not immediately clear why.. |
|
@rahul-malik it'd also be good to get a sample project with swift in it, so we can make sure everything is working correctly. |
| @@ -161,6 +161,8 @@ struct XCBuildSettings: Encodable { | |||
| var moduleMapFile: First<String>? | |||
| // Disable Xcode derived headermaps, be explicit to avoid divergence | |||
| var useHeaderMap: First<String>? = First("NO") | |||
| var swiftVersion: First<String>? | |||
There was a problem hiding this comment.
@rahul-malik is this the correct data type in Xcode?
| @@ -211,6 +215,7 @@ struct XCBuildSettings: Encodable { | |||
| var container = encoder.container(keyedBy: CodingKeys.self) | |||
|
|
|||
| try container.encode(copts.joined(separator: " "), forKey: .copts) | |||
| try container.encode(swiftCopts.joined(separator: " "), forKey: .copts) | |||
There was a problem hiding this comment.
@rahul-malik did you intend to set OTHER_SWIFT_FLAGS here? This LOC overwrites OTHER_CFLAGS
| settings.swiftVersion <>= First(swiftVersion) | ||
| case .swiftc_opts: | ||
| if let coptsArray = value as? [String] { | ||
| let processedOpts = coptsArray.map { opt -> String in |
There was a problem hiding this comment.
Do we need to patch these for bazel-genfiles ( and for external in a followup ). We should have an example of a swift genfile in a swift_library in a sample. Consider either adding this to UrlGet or just creating a new project where we can add all the swift edge cases.
There was a problem hiding this comment.
Probably patch this for external with the PR that handles external repos. Adding a new example is a good idea
There was a problem hiding this comment.
lets do this in a follow up PR
|
Hey @rahul-malik - this one LGTM, mostly. Would you add an example with some |
rahul-malik
force-pushed
the
rmalik-swift-opts
branch
3 times, most recently
from
8614324
to
dca0af2
Compare
- Adds support for SWIFT_VERSION, and OTHER_SWIFT_FLAGS (swift copts) - Add Tailor project to test suite
rahul-malik
force-pushed
the
rmalik-swift-opts
branch
from
dca0af2
to
a3518bc
Compare
| } | ||
| settings.swiftVersion <>= First(swiftVersion) | ||
| case .has_swift_dependency, .has_swift_info: | ||
| guard let swiftVersion = try? ShellOut.shellOut(to: "xcrun swift package tools-version") else { |
There was a problem hiding this comment.
This only works if there's a Package.swift, which not all projects will have. I've opened an issue: #124
No description provided.