-
Notifications
You must be signed in to change notification settings - Fork 85
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.
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
Update for rules_swift 2.x #879
Conversation
This fixes a missing `_swift_vfs.yaml` error related to the changes in: bazelbuild/rules_swift#1191
swiftc_inputs
instead of deps
for Swift VFS target
When testing this we should ensure The current changes help get the missing vfs file added but then leads to: error: cannot load underlying module <Module> |
da4b65e
to
83c7ae4
Compare
Should be fixed now! @brentleyjones tested on their project. @thiagohmcruz mind testing that this works for you as well in Going to test in cash soon |
Per Slack, this has BwtB issues still. |
b8b4692
to
beb8059
Compare
I updated the I did verify this builds for us using If CI goes green I'm going to merge to unblock using rules_swift 2.0 and we can follow up with any other improvements if we run into them. |
This moves resource generation (and being added to `deps`) below the `framework_vfs` creation which uses the `deps` With the change in #879 to add the vfs to the `swiftc_inputs` instead of the `deps` of the `swift_library` the `framework_vfs` was now also forwarding the resources (because it gets added to `deps` after generation) to other rules (like `rules_xcodeproj`) which collect extra files from this the `swiftc_inputs` attr. AFAIK resources aren't needed for the `framework_vfs` rules and so this change should resolve the new `rules_xcodeproj` incompatibility while making the `deps` to the `framework_vfs` more scoped.
This moves resource generation (and being added to `deps`) below the `framework_vfs` creation which uses the `deps` With the change in #879 to add the vfs to the `swiftc_inputs` instead of the `deps` of the `swift_library` the `framework_vfs` was now also forwarding the resources (because it gets added to `deps` after generation) to other rules (like `rules_xcodeproj`) which collect extra files from this the `swiftc_inputs` attr. AFAIK resources aren't needed for the `framework_vfs` rules and so this change should resolve the new `rules_xcodeproj` incompatibility while making the `deps` to the `framework_vfs` more scoped.
In #879 we added the extended modulemap to the `swiftc_inputs` below this line. This PR removes the non extended modulemap from being added as an input as we only need the extended version.
This fixes a missing
_swift_vfs.yaml
error related to the changes in: bazelbuild/rules_swift#1191Fixes #875