Update for rules_swift 2.x #879
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes a missing `_swift_vfs.yaml` error related to the changes in: bazelbuild/rules_swift#1191
luispadron
changed the title
swiftc_inputs instead of deps for Swift VFS target
luispadron
changed the title
brentleyjones
approved these changes
Jun 27, 2024
luispadron
changed the title
|
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> |
luispadron
force-pushed
the
luis/update-for-rules_swift-2.0
branch
2 times, most recently
from
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 |
jszumski
approved these changes
Jun 27, 2024
|
Per Slack, this has BwtB issues still. |
luispadron
force-pushed
the
luis/update-for-rules_swift-2.0
branch
2 times, most recently
from
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. |
luispadron
added a commit
that referenced
this pull request
Jul 5, 2024
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.
luispadron
added a commit
that referenced
this pull request
Jul 5, 2024
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.
luispadron
added a commit
that referenced
this pull request
Jul 5, 2024
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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a missing
_swift_vfs.yamlerror related to the changes in: bazelbuild/rules_swift#1191Fixes #875