Skip to content

Commit 6aa4540

Browse files
ssaradssaradp
andauthored
Remove references to objc_provider and remove force_load_direct_deps to support rules_apple > 3.15.0 (#934)
1) With rules_apple removing legacy objc_providers, rules_apple > 3.15.0 is no longer compatible with rules_ios due to bazelbuild/rules_apple#2611 2) Removing force load direct deps as its no longer needed in Bazel 7 #862 ```sh ERROR: /Users/ssarad/Bazel/BUILD.bazel:3:15: in apple_framework_packaging rule Traceback (most recent call last): File "/Users/ssarad/.bazel_cache/output/external/rules_ios~/rules/framework.bzl", line 1109, column 48, in _apple_framework_packaging_impl bundle_outs = _bundle_dynamic_framework(ctx, is_extension_safe = is_extension_safe, avoid_deps = avoid_deps) File "/Users/ssarad/.bazel_cache/output/external/rules_ios~/rules/framework.bzl", line 888, column 44, in _bundle_dynamic_framework partials.framework_provider_partial( File "/Users/ssarad/.bazel_cache/output/external/rules_apple~/apple/internal/partials/framework_provider.bzl", line 94, column 5, in framework_provider_partial def framework_provider_partial( Error: framework_provider_partial() got unexpected keyword argument: objc_provider ``` This PR is attempt to make rules_ios compatible with rules_apple + remove the legacy code to force load direct deps as with Bazel 7, `--incompatible_objc_alwayslink_by_default` does the same thing. --------- Co-authored-by: Sarad <sarad.pant@capitalone.com>
1 parent 8da30c9 commit 6aa4540

28 files changed

+86
-317
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
XCODE_VERSION: ${{ matrix.xcode_version }}
3030
USE_BAZEL_VERSION: ${{ matrix.bazel_version }}
3131
LATEST_RULES_SWIFT_VERSION: 2.1.1
32-
LATEST_RULES_APPLE_VERSION: 3.8.0
32+
LATEST_RULES_APPLE_VERSION: 3.15.0
3333
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3434
steps:
3535
- uses: actions/checkout@v4

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ bazel_dep(
2222
)
2323
bazel_dep(
2424
name = "rules_apple",
25-
version = "3.5.1",
25+
version = "3.15.0",
2626
repo_name = "build_bazel_rules_apple",
2727
)
2828
bazel_dep(
2929
name = "rules_cc",
30-
version = "0.0.6",
30+
version = "0.0.10",
3131
)
3232
bazel_dep(
3333
name = "rules_swift",

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ See the following table for supported rules_apple release versions.
4444

4545
| rules_apple release | Minimum supported rules version | Final supported rules version
4646
|:-------------------:|:-------------------------:|:-------------------------:
47-
| 3.5.1 | 4.3.1 | current
47+
| 3.15.0 | 5.3.0 | current
4848
| 3.* | 3.* | 4.2.1
4949
| 2.* | 2.* | 3.2.2
5050
| 1.* | 1.0.0 | 3.2.2

docs/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ _DOC_SRCS = [
1414
"import_middleman",
1515
"library",
1616
"plists",
17-
"force_load_direct_deps",
1817
"precompiled_apple_resource_bundle",
1918
"providers",
2019
"substitute_build_settings",

docs/app_clip_doc.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
## ios_app_clip
88

99
<pre>
10+
load("@rules_ios//rules:app_clip.bzl", "ios_app_clip")
11+
1012
ios_app_clip(<a href="#ios_app_clip-name">name</a>, <a href="#ios_app_clip-families">families</a>, <a href="#ios_app_clip-infoplists">infoplists</a>, <a href="#ios_app_clip-infoplists_by_build_setting">infoplists_by_build_setting</a>, <a href="#ios_app_clip-xcconfig">xcconfig</a>,
1113
<a href="#ios_app_clip-xcconfig_by_build_setting">xcconfig_by_build_setting</a>, <a href="#ios_app_clip-kwargs">kwargs</a>)
1214
</pre>

docs/app_doc.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
## ios_application
88

99
<pre>
10+
load("@rules_ios//rules:app.bzl", "ios_application")
11+
1012
ios_application(<a href="#ios_application-name">name</a>, <a href="#ios_application-families">families</a>, <a href="#ios_application-apple_library">apple_library</a>, <a href="#ios_application-infoplists">infoplists</a>, <a href="#ios_application-infoplists_by_build_setting">infoplists_by_build_setting</a>, <a href="#ios_application-xcconfig">xcconfig</a>,
1113
<a href="#ios_application-xcconfig_by_build_setting">xcconfig_by_build_setting</a>, <a href="#ios_application-kwargs">kwargs</a>)
1214
</pre>

docs/extension_doc.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
## ios_extension
88

99
<pre>
10+
load("@rules_ios//rules:extension.bzl", "ios_extension")
11+
1012
ios_extension(<a href="#ios_extension-name">name</a>, <a href="#ios_extension-families">families</a>, <a href="#ios_extension-infoplists">infoplists</a>, <a href="#ios_extension-infoplists_by_build_setting">infoplists_by_build_setting</a>, <a href="#ios_extension-xcconfig">xcconfig</a>,
1113
<a href="#ios_extension-xcconfig_by_build_setting">xcconfig_by_build_setting</a>, <a href="#ios_extension-kwargs">kwargs</a>)
1214
</pre>

docs/force_load_direct_deps_doc.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

docs/framework_doc.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Framework rules
77
## apple_framework_packaging
88

99
<pre>
10+
load("@rules_ios//rules:framework.bzl", "apple_framework_packaging")
11+
1012
apple_framework_packaging(<a href="#apple_framework_packaging-name">name</a>, <a href="#apple_framework_packaging-deps">deps</a>, <a href="#apple_framework_packaging-data">data</a>, <a href="#apple_framework_packaging-bundle_extension">bundle_extension</a>, <a href="#apple_framework_packaging-bundle_id">bundle_id</a>, <a href="#apple_framework_packaging-environment_plist">environment_plist</a>,
1113
<a href="#apple_framework_packaging-exported_symbols_lists">exported_symbols_lists</a>, <a href="#apple_framework_packaging-framework_name">framework_name</a>, <a href="#apple_framework_packaging-frameworks">frameworks</a>, <a href="#apple_framework_packaging-infoplists">infoplists</a>,
1214
<a href="#apple_framework_packaging-library_linkopts">library_linkopts</a>, <a href="#apple_framework_packaging-link_dynamic">link_dynamic</a>, <a href="#apple_framework_packaging-minimum_deployment_os_version">minimum_deployment_os_version</a>,
@@ -49,6 +51,8 @@ Packages compiled code into an Apple .framework package
4951
## apple_framework
5052

5153
<pre>
54+
load("@rules_ios//rules:framework.bzl", "apple_framework")
55+
5256
apple_framework(<a href="#apple_framework-name">name</a>, <a href="#apple_framework-apple_library">apple_library</a>, <a href="#apple_framework-infoplists">infoplists</a>, <a href="#apple_framework-infoplists_by_build_setting">infoplists_by_build_setting</a>, <a href="#apple_framework-xcconfig">xcconfig</a>,
5357
<a href="#apple_framework-xcconfig_by_build_setting">xcconfig_by_build_setting</a>, <a href="#apple_framework-kwargs">kwargs</a>)
5458
</pre>

docs/hmap_doc.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Header Map rules
77
## headermap
88

99
<pre>
10+
load("@rules_ios//rules:hmap.bzl", "headermap")
11+
1012
headermap(<a href="#headermap-name">name</a>, <a href="#headermap-hdrs">hdrs</a>, <a href="#headermap-direct_hdr_providers">direct_hdr_providers</a>, <a href="#headermap-namespace">namespace</a>)
1113
</pre>
1214

@@ -32,14 +34,15 @@ regardless of the package structure being used.
3234
## HeaderMapInfo
3335

3436
<pre>
37+
load("@rules_ios//rules:hmap.bzl", "HeaderMapInfo")
38+
3539
HeaderMapInfo(<a href="#HeaderMapInfo-files">files</a>)
3640
</pre>
3741

3842
Propagates header maps
3943

4044
**FIELDS**
4145

42-
4346
| Name | Description |
4447
| :------------- | :------------- |
4548
| <a id="HeaderMapInfo-files"></a>files | depset with headermaps |
@@ -50,6 +53,8 @@ Propagates header maps
5053
## hmap.make_hmap
5154

5255
<pre>
56+
load("@rules_ios//rules:hmap.bzl", "hmap")
57+
5358
hmap.make_hmap(<a href="#hmap.make_hmap-actions">actions</a>, <a href="#hmap.make_hmap-headermap_builder">headermap_builder</a>, <a href="#hmap.make_hmap-output">output</a>, <a href="#hmap.make_hmap-namespace">namespace</a>, <a href="#hmap.make_hmap-hdrs_lists">hdrs_lists</a>)
5459
</pre>
5560

0 commit comments

Comments
 (0)