-
Notifications
You must be signed in to change notification settings - Fork 90
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 to bazel5 #385
Update to bazel5 #385
Changes from all commits
d460407
1dc8594
26e2fc0
ec76442
685be43
85c4820
1e56610
841fc01
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
4.1.0 | ||
5.0.0rc3 | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -974,7 +974,8 @@ def apple_library(name, library_tools = {}, export_private_headers = True, names | |
"@build_bazel_rules_ios//:virtualize_frameworks": framework_vfs_objc_copts, | ||
"//conditions:default": framework_vfs_objc_copts if enable_framework_vfs else [], | ||
}) | ||
|
||
if module_map: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We solve a problem with modulemaps by appending the module_map to the objc headers list. An alternative approach is here: 7f4fe87 However this approach may be preferable because bazel sees that modulemap is a dependency of the objc-library target. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For this change, we return module_map target from the apple_library macro, since the objc-provider in bazel5 no longer supports it. See bazelbuild/bazel@31bec27#diff-eb9c179576423931e9db781a5acff548a82a4361a23ce1c1dc0c6b73b30d114bL35 |
||
objc_hdrs.append(module_map) | ||
objc_library( | ||
name = objc_libname, | ||
srcs = objc_sources + objc_private_hdrs + objc_non_exported_hdrs, | ||
|
Large diffs are not rendered by default.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great that this is all working now!