Skip to content

[Bazel6] Handle removal of ObjcProvider.direct_headers #620

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

Conversation

mattrobmattrob
Copy link
Collaborator

Handle bazelbuild/bazel#14559 (bazelbuild/bazel@8a2b711) to prepare for Bazel 6 but still work in Bazel 5.

Copy link
Contributor

@jerrymarino jerrymarino left a comment

Choose a reason for hiding this comment

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

Thanks for tackling this in a way that works with the LTS release ❤️

@@ -410,7 +410,7 @@ def _get_direct_public_headers(provider, dep):
return []
return dep[provider].compilation_context.direct_public_headers
elif provider == apple_common.Objc:
return dep[provider].direct_headers
return getattr(dep[provider], "direct_headers", [])
Copy link
Contributor

Choose a reason for hiding this comment

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

@mattrobmattrob so the gist is that the previous condition is hit on Bazel 6. LGTM overall

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I didn't confirm that but as far as I can tell, yes. At least for all the cases tested by my code and the CI suite.

@mattrobmattrob mattrobmattrob marked this pull request as ready for review December 3, 2022 02:44
@mattrobmattrob mattrobmattrob merged commit 05a4b3e into bazel-ios:master Dec 5, 2022
@mattrobmattrob mattrobmattrob deleted the mr/bazel6/clean.up.ObjcProvider.direct_headers branch December 5, 2022 14:24
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.

3 participants