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.

Sign up for GitHub

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

Jump to bottom

[Bazel6] Remove ObjcProvider.module_map -> ObjcProvider.header #625

Merged
merged 1 commit into from
Dec 6, 2022
Merged

[Bazel6] Remove ObjcProvider.module_map -> ObjcProvider.header #625

merged 1 commit into from
Dec 6, 2022

Conversation

mattrobmattrob
Copy link
Collaborator

@mattrobmattrob mattrobmattrob commented Dec 6, 2022 •
edited
Loading

Remove the “hack” that propagates the ObjcProvider.module_map into ObjcProvider.header field since it doesn’t exist anymore. This is sorta like bazelbuild/rules_apple#1319 in rules_apple for handling this change in Bazel core/ObjcProvider:

bazelbuild/bazel@8a2b711#diff-85a50fa66fc245291c6d06d99b941e9ecb570762fa6658cf10d7fc6b265a5742L129-L133

Error in Bazel 6.0.0:

$ bazelisk test --local_test_jobs=1 -- //... -//tests/ios/...
ERROR: /private/var/tmp/_bazel_matt.robinson/0e64031a9efbb95e4728094ee9457143/external/TensorFlowLiteC/BUILD.bazel:15:30: in _apple_framework_import_modulemap rule @TensorFlowLiteC//:TensorFlowLiteC:
Traceback (most recent call last):
	File "/Users/matt.robinson/Developer/rules_ios/rules_ios/rules/apple_patched.bzl", line 128, column 55, in _apple_framework_import_modulemap_impl
		new_objc_provider = apple_common.new_objc_provider(**objc_provider_fields)
Error in new_objc_provider: Argument header not a recognized key, 'strict_include', or 'providers'.

@mattrobmattrob
Remove ObjcProvider.module_map -> ObjcProvider.header
2adfd87 
Remove the “hack” that propagates the `ObjcProvider.module_map` into `ObjcProvider.header` field since it doesn’t exist anymore. This is sorta like bazelbuild/rules_apple#1319 in `rules_apple`.
@mattrobmattrob mattrobmattrob changed the title Remove ObjcProvider.module_map -> ObjcProvider.header [Bazel6] Remove ObjcProvider.module_map -> ObjcProvider.header Dec 6, 2022
@mattrobmattrob mattrobmattrob mentioned this pull request Dec 6, 2022
Merged
@mattrobmattrob mattrobmattrob marked this pull request as ready for review December 6, 2022 21:18
@mattrobmattrob mattrobmattrob enabled auto-merge (squash) December 6, 2022 21:22
jerrymarino
jerrymarino approved these changes Dec 6, 2022
View reviewed changes
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.

Nice PR - thanks for cleaning this up @mattrobmattrob 🚢 👏

@mattrobmattrob mattrobmattrob merged commit 45d5cac into bazel-ios:master Dec 6, 2022
@mattrobmattrob mattrobmattrob deleted the mr/bazel6/remove.objcprovider.header.hack branch December 6, 2022 23:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jerrymarino jerrymarino jerrymarino approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mattrobmattrob @jerrymarino