Skip to content
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

Move resource generation below framework vfs #880

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

luispadron
Copy link
Collaborator

@luispadron luispadron commented 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. This led to duplicated resources in the project as they're collected from resources and now the transitive deps of the framework_vfs

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.
@luispadron luispadron force-pushed the luis/move-resource-generation-below-vfs branch from c18a6d7 to b76f03e Compare July 5, 2024 16:10
@luispadron luispadron marked this pull request as ready for review July 5, 2024 16:48
Copy link
Contributor

@thiagohmcruz thiagohmcruz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At first glance I don't see any issues with the change. I'll test it in our project and report issues if I find any.

@luispadron luispadron merged commit 6d580f1 into master Jul 9, 2024
12 checks passed
@luispadron luispadron deleted the luis/move-resource-generation-below-vfs branch July 9, 2024 01:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants