-
Notifications
You must be signed in to change notification settings - Fork 2
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
[rules_ios] Rebase onto upstream 4.8.2, squash patches, and fix / cleanup custom patches #15
Commits on May 6, 2024
-
Stop processing data twice in make_vfsoverlay (#871)
This `data` struct is already included in `vfs_info.values()` here: https://github.com/bazel-ios/rules_ios/blob/311ba90785a7be2445f12e677beb7d32aead22e6/rules/framework/vfs_overlay.bzl#L387
Configuration menu - View commit details
-
Copy full SHA for 02d67cd - Browse repository at this point
Copy the full SHA 02d67cdView commit details
Commits on May 10, 2024
-
Update usage of
to_json
tojson.encode
(#872)`to_json` was removed from `struct` in latest Bazel versions. This is backwards compatible from Bazel 6+
Configuration menu - View commit details
-
Copy full SHA for 70e2438 - Browse repository at this point
Copy the full SHA 70e2438View commit details
Commits on Jun 5, 2024
-
Fix import_middleman in Bazel 7 (#873)
Can be considered a follow up to bazel-ios/rules_ios#850 to fix `import_middleman` in Bazel 7 while keeping it backwards compatible with Bazel 6.
Configuration menu - View commit details
-
Copy full SHA for 839cf60 - Browse repository at this point
Copy the full SHA 839cf60View commit details
Commits on Jun 17, 2024
-
Add support for
extension_safe
attr (#876)Similar to how rules_apple supports this, add an `extension_safe` attr handling which automatically sets `-fapplication-extension`.
Configuration menu - View commit details
-
Copy full SHA for b8e53c6 - Browse repository at this point
Copy the full SHA b8e53c6View commit details -
Configuration menu - View commit details
-
Copy full SHA for b0e257d - Browse repository at this point
Copy the full SHA b0e257dView commit details
Commits on Jun 18, 2024
-
Configuration menu - View commit details
-
Copy full SHA for ec08184 - Browse repository at this point
Copy the full SHA ec08184View commit details
Commits on Jul 3, 2024
-
Update for rules_swift 2.x (#879)
This fixes a missing `_swift_vfs.yaml` error related to the changes in: bazelbuild/rules_swift#1191 Fixes #875
Configuration menu - View commit details
-
Copy full SHA for 1ec546a - Browse repository at this point
Copy the full SHA 1ec546aView commit details
Commits on Jul 9, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 6d580f1 - Browse repository at this point
Copy the full SHA 6d580f1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 52d1f18 - Browse repository at this point
Copy the full SHA 52d1f18View commit details -
Increase max compatibility level for rules_swift to 2 (#882)
This is required to support both rules_swift 1.x and 2.x
Configuration menu - View commit details
-
Copy full SHA for 28d97a9 - Browse repository at this point
Copy the full SHA 28d97a9View commit details
Commits on Aug 13, 2024
-
[rules_ios] Add static library variant to allow rewriting headers (#1)
Add an `apple_static_library` that lets us map source files to arbitrary relative include paths by creating a link tree, and adding that link tree to the deps of a main library. This also uses apple_library instead of apple_framework as the framework is frankly unnecessary for what we're trying to build for third party deps. Test Plan: Ported fmt locally to use this, and ran `clyde ios build` Tasks: https://app.asana.com/0/1203960884932166/1204190072048691 https://app.asana.com/0/1203960884932166/1204190072362093 [transitions] Do not remove cpus from configured target graph (#2) Upstream converts ios_multi_cpus to a single value. rules_pods does not. So when rules_pods objc_library rules depend on rules_ios rules, they are considered different configurations, and we end up splitting the configured target graph into two configurations. When swift, objc, etc try to link in all objc_libraries later in the build, they then try to link the same library twice, because the configured nodes are duplicated, and we run into duplicate symbol, module redefinition, etc errors. In theory, this could be reverted once the rules_ios migration is complete, but for our use case, it should not hurt anything being present. This logic, also, only affects our opt builds that build for multiple cpus. The development builds are unaffected. [rules_ios] Re-enable cpp rules (#3) This was accidentally disabled. It is required for glog, so turn this back on so that .cc/.cpp sources and their .a files are properly propagated. Tested by doing a build with this change off of main [rules_ios] Use -idirafter instead of -I (#4) NOTE: that this may cause issues for libraries that anticipate the `-I.` behavior and do something like `#include "Foo.h"` when there are multiple "Foo.h" in libs in its dependencies. In those cases, `-I.` can be added to its copts explicitly. There are some places where using -I can actually cause problems with system header collisions. Notably, fmt has a "locale.h" file. Without this change, you can end up with a chain that is: "fmt/locale.h" -> <locale> -> <clocale> -> <locale.h> -> failure, because -I causes fmt/locale.h to be searched (I believe due to the entries in the headermap being -I) before system paths. See https://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html for resolution order [rules_ios] Allow rewriting header paths for frameworks and libraries (#5) This allows us to pick a different relative include path for header files. This is needed because some third party dependencies have e.g. colliding base filenames (folly has multiple Core.h, e.g.), or included files do relative includes (kv-storage includes "kv-storage/api/Core.h"), and with the current approach taken by apple_framework of flattening the headers out, that path doesn't actually exist in the Headers or PrivateHeaders directories of the .framework file. This patch does a few things: - Adds an extra argument "header_mapping". This is how users define where public/private headers should be accessible. If not specified, or a header is not in this mapping, then the basename of the header is used. (e.g. kv-storage.framework/Headers/Core.h) - Updates the hmapbuild binary so that we can specify these destinations in the .hmap files - Updates the umbrella header to use these destinations - Updates apple_framework/apple_library to thread these mappings through. Tested on a WIP branch (annie/native-versions-ios), and we seemed to get past the #include failures, and onto errors in their code itself. Will also test this with the flipper-folly migration locally. https://app.asana.com/0/1203960884932166/1204190072362095 https://app.asana.com/0/1203960884932166/1204190072362093 [rules_ios] Make modulemaps have '[system]', fix static_library deps (#6) - There was an ordering issue with apple_static_library where it didn't include the symlink map in the deps for the apple_library call. Make sure to route it through. - When changing over to cocoapods bazel, we modularize a lot of things, which causes a lot of extra warnings to show up from third party packages. We're not really in charge of maintaining their code, so just add the "[system]" tag to the modulemap file. This makes the headers get included as if they were included through -isystem, not -I [rules_ios] Export as system_includes (#7) For system / 3rd party libraries, export the symlink dir as -isystem, not -I. [rules_ios] Add objc_public_headers (#9) Add an `objc_public_headers` attribute to apple_* rules. This changes the umbrella header, if set, such that it includes all public_headers headers when compiled against c++, and only a subset of headers (objc_public_headers) when compiled against objective c. The main problem this is solving is that we have a main module map for each library. When trying to import *anything* from the framework, it loads the entire module map and every include in the umbrella header. If you put c++-only headers in it, it will try to interpret those without c++ support if you try to include the .h from a .m file. This allows us to have headers that mix (obj)c++ and objc in a single framework. It should also allow us to drop some of the -objc rules we've had to clunkily build out. [rules_ios] Expose cc_headers_symlinks, add a helper function for headers (#10) Expose cc_headers_symlinks so that we can use it in a refactor of React-Core and ReactCommon. Also expose a helper function for use by ReactCommon [rules_ios] Add more entitlement errors (#12) If there are keys that are in the .entitlements file that are missing from the provisioning profile, this normally results in an error. However, this is a manually specified list. These storekit ones bit us recently, so add the storekit ones, and then just pull in the list from main (https://github.com/bazelbuild/rules_apple/blob/cc1e5b17d0bf16a74c74f9fb3e2940d9c97c12da/tools/plisttool/plisttool.py#L295-L314) [rules_ios] Add more configurability to headers_mapping (#11) When this just takes a dictionary, it requires us to do a lot more boilerplate work to first construct that dictionary. Add a couple of helpers for the common use cases that are in repo. [rules_apple] add upstream filesystem patches (#13) this adds [this commit](bazelbuild/rules_apple@306e300) to address this error when copying results files across filesystem boundaries. [rules_apple] Add support for xcprivacy manifests in extensions (#14) Bringing a change in from upstream of rules_apple to support adding privacy manifests for our extensions bazelbuild/rules_apple@e9159fa
Configuration menu - View commit details
-
Copy full SHA for 614d92b - Browse repository at this point
Copy the full SHA 614d92bView commit details -
Remove apple_common.new_objc_provider; it causes rules_* to try to ge…
…nerate a swift module map
Configuration menu - View commit details
-
Copy full SHA for 2b80aaa - Browse repository at this point
Copy the full SHA 2b80aaaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 202747f - Browse repository at this point
Copy the full SHA 202747fView commit details