Skip to content

Commit b76b73f

Browse files
lucasromanomrlucasromanomr
authored
Merge branch 'main' into feat/add-coverage-options
2 parents 073520c + 8eacfbf commit b76b73f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2018
-1963
lines changed

‎.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.1
1+
8.0.0

‎MODULE.bazel

+9-14
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ bazel_dep(
1616
)
1717
bazel_dep(
1818
name = "rules_apple",
19-
version = "3.6.0",
19+
version = "3.16.1",
2020
repo_name = "build_bazel_rules_apple",
2121
)
2222
bazel_dep(name = "rules_python", version = "0.27.1")
@@ -45,7 +45,7 @@ bazel_dep(
4545
)
4646
bazel_dep(
4747
name = "rules_pkg",
48-
version = "0.9.1",
48+
version = "1.0.1",
4949
dev_dependency = True,
5050
)
5151
bazel_dep(
@@ -55,26 +55,21 @@ bazel_dep(
5555
repo_name = "io_bazel_stardoc",
5656
)
5757

58-
# To support Bazel 8 tests
58+
# Use newer versions of deps in development
5959
single_version_override(
60-
module_name = "rules_apple",
61-
version = "3.5.1",
60+
module_name = "apple_support",
61+
version = "1.17.1",
6262
)
6363

6464
single_version_override(
6565
module_name = "rules_swift",
66-
version = "1.18.0",
66+
version = "2.3.0",
6767
)
6868

69+
# Some of our deps are forcing a new stardoc on us, so pinning for now
6970
single_version_override(
70-
module_name = "apple_support",
71-
version = "1.15.1",
72-
)
73-
74-
# For Stardoc
75-
single_version_override(
76-
module_name = "bazel_skylib",
77-
version = "1.6.0",
71+
module_name = "stardoc",
72+
version = "0.6.1",
7873
)
7974

8075
apple_cc_configure = use_extension(

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ to include it in the list above.
8080

8181
| rules_xcodeproj | Bazel | [rules_apple][1] | [rules_swift][2] | Xcode | macOS | Supporting Branch |
8282
| :-------------: | :---: | :--------------: | :--------------: | :---: | :---: | :---------------: |
83-
| 1.17.0+ | 6.3-7.x | 1.0.1–2.x | 1.x | 13.3–15.x | 13–14.x | `main` |
83+
| 2.10.0+ | 7.0-9.x | 3.16.1+ | 1.18.0+ | 13.3–15.x | 13–14.x | `main` |
84+
| 1.17.0+ | 6.3-7.x | 1.0.1–2.x | 1.x | 13.3–15.x | 13–14.x | - |
8485
| 1.16.0 | 6.3-7.x | 1.0.1–2.x | 1.x | 13.3–15.2 | 13–14.x | - |
8586
| 1.14.0-1.15.0 | 6.1-7.x | 1.0.1–2.x | 1.x | 13.3–15.2 | 13–14.x | - |
8687
| 1.7.0-1.13.0 | 5.3–6.x | 1.0.1–2.x | 1.x | 13.3–15.2 | 12–13.x | - |

‎bazel_6.bazelrc

-12
This file was deleted.

‎bazel_7.bazelrc

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
common --incompatible_fail_on_unknown_attributes
2-
3-
build:cache --remote_build_event_upload=minimal
1+
common --incompatible_disallow_empty_glob

‎bazel_9.bazelrc

Whitespace-only changes.

‎buildbuddy.yaml

+3-31
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@ x_templates:
1717
env: {}
1818
- &bazel_previous_lts
1919
env:
20-
USE_BAZEL_VERSION: 6.x
20+
USE_BAZEL_VERSION: 7.x
2121
- &bazel_lts
2222
env:
23-
USE_BAZEL_VERSION: 7.x
23+
USE_BAZEL_VERSION: 8.x
2424
- &bazel_head
2525
env:
26-
# See https://github.com/MobileNativeFoundation/rules_xcodeproj/pull/3029
27-
#
28-
# Temporary change to make CI pass until the fix is in `last_green`
29-
USE_BAZEL_VERSION: dd2464a5933e0a5a6765024573832717b71989bf
26+
USE_BAZEL_VERSION: last_green
3027

3128
- &normal_resources
3229
resource_requests: { memory: 6GB }
@@ -130,14 +127,6 @@ actions:
130127
# Not validate since Bazel 8 Bzlmod paths are different
131128
- *generate_integration
132129
- *build_all
133-
- name: Integration Test - "examples/integration" - Bazel LTS using WORKSPACE
134-
<<: *bazel_lts
135-
<<: *action_base
136-
<<: *normal_resources
137-
<<: *examples_integration_workspace
138-
bazel_commands:
139-
- *nobzlmod_generate_integration
140-
- *nobzlmod_build_all
141130
- name: Integration Test - "examples/integration" - Bazel HEAD
142131
<<: *bazel_head
143132
<<: *arm64
@@ -147,14 +136,6 @@ actions:
147136
bazel_commands:
148137
- *validate_integration
149138
- *build_all
150-
- name: Integration Test - "examples/integration" - Bazel HEAD using WORKSPACE
151-
<<: *bazel_head
152-
<<: *action_base
153-
<<: *normal_resources
154-
<<: *examples_integration_workspace
155-
bazel_commands:
156-
- *nobzlmod_generate_integration
157-
- *nobzlmod_build_all
158139

159140
- name: Integration Test - "examples/rules_ios" - Bazel Previous LTS
160141
<<: *bazel_previous_lts
@@ -175,15 +156,6 @@ actions:
175156
bazel_commands:
176157
- *validate_integration
177158
- *build_all
178-
- name: Integration Test - "examples/rules_ios" - Bazel LTS using WORKSPACE
179-
<<: *bazel_lts
180-
<<: *arm64
181-
<<: *action_base
182-
<<: *normal_resources
183-
<<: *examples_rules_ios_workspace
184-
bazel_commands:
185-
- *validate_integration
186-
- *nobzlmod_build_all
187159
## Uncomment once rules_ios supports Bazel 8
188160
# - name: Integration Test - "examples/rules_ios" - Bazel HEAD
189161
# <<: *bazel_head

‎examples/integration/.bazelrc

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ import %workspace%/../../shared.bazelrc
33

44
build --experimental_cc_implementation_deps
55

6+
# Until we fix our examples for Bazel 8
7+
common --enable_workspace
8+
69
# Exercise the extra flags feature
710

811
build:rules_xcodeproj --@rules_xcodeproj//xcodeproj:extra_common_flags='--verbose_failures'

‎examples/integration/ExtensionKitExtension/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>EXAppExtensionAttributes</key>
1616
<dict>
1717
<key>EXExtensionPointIdentifier</key>
18-
<string>com.apple.generic-extension</string>
18+
<string>com.apple.services</string>
1919
</dict>
2020
</dict>
2121
</plist>

‎examples/integration/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bazel_dep(
1010
)
1111
bazel_dep(
1212
name = "rules_apple",
13-
version = "3.6.0",
13+
version = "3.16.1",
1414
repo_name = "build_bazel_rules_apple",
1515
)
1616
bazel_dep(

‎examples/integration/iOSApp/Resources/ExampleResources/dep_resources_collector.bzl

+1-5
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ _deps_aspect = aspect(
2626
attr_aspects = ["*"],
2727
)
2828

29-
_is_bazel_6 = hasattr(apple_common, "link_multi_arch_static_library")
30-
3129
def _dep_resources_collector_impl(ctx):
3230
all_deps = depset(
3331
transitive = [dep[DepCollectorInfo].dep_names for dep in ctx.attr.deps],
@@ -39,9 +37,7 @@ def _dep_resources_collector_impl(ctx):
3937
command = "echo '{}' > {}".format("\n".join(all_deps), output.path),
4038
)
4139

42-
res = [output]
43-
if _is_bazel_6:
44-
res = {tuple(): res}
40+
res = {tuple(): [output]}
4541

4642
return resources.bucketize(
4743
resources = res,

‎examples/integration/iOSApp/external/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ module(
66

77
bazel_dep(
88
name = "rules_apple",
9-
version = "2.1.0",
9+
version = "3.16.1",
1010
repo_name = "build_bazel_rules_apple",
1111
)

‎examples/integration/test/fixtures/bazel-8/bwb_replacements.txt

+30-30
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
CONFIGURATION-STABLE-0 darwin_x86_64-dbg-ST-376989c9bb44
22
CONFIGURATION-STABLE-1 darwin_x86_64-dbg-ST-65b9ae3229ca
33
CONFIGURATION-STABLE-2 darwin_x86_64-opt-ST-4603bbaf5d98
4-
CONFIGURATION-STABLE-3 ios_x86_64-dbg-ios-x86_64-min15.0-applebin_ios-ST-ec49b5570e6a
5-
CONFIGURATION-STABLE-4 watchos_x86_64-dbg-watchos-x86_64-min7.0-applebin_watchos-ST-c601ed35d954
6-
CONFIGURATION-STABLE-5 ios_x86_64-dbg-ios-x86_64-min16.0-applebin_ios-ST-7c661f35007d
7-
CONFIGURATION-STABLE-6 tvos_x86_64-dbg-tvos-x86_64-min15.0-applebin_tvos-ST-8fa93ae60f3c
8-
CONFIGURATION-STABLE-7 darwin_x86_64-dbg-macos-x86_64-min12.0-applebin_macos-ST-e4d1b54e0a5f
9-
CONFIGURATION-STABLE-8 ios_arm64-dbg-ios-arm64-min15.0-applebin_ios-ST-d4ed85805c03
10-
CONFIGURATION-STABLE-9 watchos_arm64_32-dbg-watchos-arm64_32-min7.0-applebin_watchos-ST-2d1383ea1bfd
11-
CONFIGURATION-STABLE-10 ios_arm64-dbg-ios-arm64-min16.0-applebin_ios-ST-9d40ca217462
12-
CONFIGURATION-STABLE-11 tvos_arm64-dbg-tvos-arm64-min15.0-applebin_tvos-ST-f0bf1e4db2b5
13-
CONFIGURATION-STABLE-12 ios_x86_64-opt-ios-x86_64-min15.0-applebin_ios-ST-f0647120a524
14-
CONFIGURATION-STABLE-13 watchos_x86_64-opt-watchos-x86_64-min7.0-applebin_watchos-ST-9b6da1c1ca96
15-
CONFIGURATION-STABLE-14 ios_x86_64-opt-ios-x86_64-min16.0-applebin_ios-ST-98784b0141f7
16-
CONFIGURATION-STABLE-15 tvos_x86_64-opt-tvos-x86_64-min15.0-applebin_tvos-ST-fd3222aa8913
17-
CONFIGURATION-STABLE-16 darwin_x86_64-opt-macos-x86_64-min12.0-applebin_macos-ST-478bd2e7095f
18-
CONFIGURATION-STABLE-17 ios_arm64-opt-ios-arm64-min15.0-applebin_ios-ST-d4b659e4a9d4
19-
CONFIGURATION-STABLE-18 watchos_arm64_32-opt-watchos-arm64_32-min7.0-applebin_watchos-ST-ecd9d94fb4e5
20-
CONFIGURATION-STABLE-19 ios_arm64-opt-ios-arm64-min16.0-applebin_ios-ST-9a1b0839beb3
21-
CONFIGURATION-STABLE-20 tvos_arm64-opt-tvos-arm64-min15.0-applebin_tvos-ST-618e0eabc398
22-
CONFIGURATION-STABLE-21 watchos_x86_64-dbg-watchos-x86_64-min8.0-applebin_watchos-ST-65044d9cb033
23-
CONFIGURATION-STABLE-22 watchos_arm64_32-dbg-watchos-arm64_32-min8.0-applebin_watchos-ST-e2adfc6423ec
24-
CONFIGURATION-STABLE-23 watchos_x86_64-opt-watchos-x86_64-min8.0-applebin_watchos-ST-b7000f81fbba
25-
CONFIGURATION-STABLE-24 watchos_arm64_32-opt-watchos-arm64_32-min8.0-applebin_watchos-ST-58e24dd35eea
26-
CONFIGURATION-STABLE-25 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-23ced71d870c
27-
CONFIGURATION-STABLE-26 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-5c2767082c6b
28-
CONFIGURATION-STABLE-27 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-7c4786726810
29-
CONFIGURATION-STABLE-28 darwin_arm64-dbg-macos-arm64-min11.0-applebin_macos-ST-5f46583411cc
30-
CONFIGURATION-STABLE-29 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-a6b23e99dd1c
31-
CONFIGURATION-STABLE-30 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-d247baf1a2e1
32-
CONFIGURATION-STABLE-31 darwin_arm64-opt-macos-arm64-min11.0-applebin_macos-ST-4320432566be
33-
CONFIGURATION-STABLE-32 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-11b4a0ee8e7b
4+
CONFIGURATION-STABLE-3 ios_x86_64-dbg-ios-x86_64-min15.0-applebin_ios-ST-729671d856ea
5+
CONFIGURATION-STABLE-4 watchos_x86_64-dbg-watchos-x86_64-min7.0-applebin_watchos-ST-a56208b3ea17
6+
CONFIGURATION-STABLE-5 ios_x86_64-dbg-ios-x86_64-min16.0-applebin_ios-ST-e07395093609
7+
CONFIGURATION-STABLE-6 tvos_x86_64-dbg-tvos-x86_64-min15.0-applebin_tvos-ST-f2eafbbb2c71
8+
CONFIGURATION-STABLE-7 darwin_x86_64-dbg-macos-x86_64-min12.0-applebin_macos-ST-c5aba9a2664d
9+
CONFIGURATION-STABLE-8 ios_arm64-dbg-ios-arm64-min15.0-applebin_ios-ST-ebc965843194
10+
CONFIGURATION-STABLE-9 watchos_arm64_32-dbg-watchos-arm64_32-min7.0-applebin_watchos-ST-ee37b6f7c2f8
11+
CONFIGURATION-STABLE-10 ios_arm64-dbg-ios-arm64-min16.0-applebin_ios-ST-22e6ffafd033
12+
CONFIGURATION-STABLE-11 tvos_arm64-dbg-tvos-arm64-min15.0-applebin_tvos-ST-34aed803ff64
13+
CONFIGURATION-STABLE-12 ios_x86_64-opt-ios-x86_64-min15.0-applebin_ios-ST-7e26020362db
14+
CONFIGURATION-STABLE-13 watchos_x86_64-opt-watchos-x86_64-min7.0-applebin_watchos-ST-0b3052a22d34
15+
CONFIGURATION-STABLE-14 ios_x86_64-opt-ios-x86_64-min16.0-applebin_ios-ST-24288e6a8a11
16+
CONFIGURATION-STABLE-15 tvos_x86_64-opt-tvos-x86_64-min15.0-applebin_tvos-ST-839820e646a4
17+
CONFIGURATION-STABLE-16 darwin_x86_64-opt-macos-x86_64-min12.0-applebin_macos-ST-fdfd02bb595a
18+
CONFIGURATION-STABLE-17 ios_arm64-opt-ios-arm64-min15.0-applebin_ios-ST-a175c2921f59
19+
CONFIGURATION-STABLE-18 watchos_arm64_32-opt-watchos-arm64_32-min7.0-applebin_watchos-ST-52c88b620570
20+
CONFIGURATION-STABLE-19 ios_arm64-opt-ios-arm64-min16.0-applebin_ios-ST-d9e7edaa2e03
21+
CONFIGURATION-STABLE-20 tvos_arm64-opt-tvos-arm64-min15.0-applebin_tvos-ST-09f0630d9e9d
22+
CONFIGURATION-STABLE-21 watchos_x86_64-dbg-watchos-x86_64-min8.0-applebin_watchos-ST-c0f93201a38e
23+
CONFIGURATION-STABLE-22 watchos_arm64_32-dbg-watchos-arm64_32-min8.0-applebin_watchos-ST-5383078a5ee1
24+
CONFIGURATION-STABLE-23 watchos_x86_64-opt-watchos-x86_64-min8.0-applebin_watchos-ST-040af2a54015
25+
CONFIGURATION-STABLE-24 watchos_arm64_32-opt-watchos-arm64_32-min8.0-applebin_watchos-ST-023f6c62a458
26+
CONFIGURATION-STABLE-25 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-ab644b0d3414
27+
CONFIGURATION-STABLE-26 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-03342bc805f6
28+
CONFIGURATION-STABLE-27 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-66f6a67d07be
29+
CONFIGURATION-STABLE-28 darwin_arm64-dbg-macos-arm64-min11.0-applebin_macos-ST-857af5314a24
30+
CONFIGURATION-STABLE-29 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-ca73ce429e0a
31+
CONFIGURATION-STABLE-30 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-34857d59845d
32+
CONFIGURATION-STABLE-31 darwin_arm64-opt-macos-arm64-min11.0-applebin_macos-ST-4e8ee0b7762f
33+
CONFIGURATION-STABLE-32 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-db9afb28d4b1
3434
CONFIGURATION-STABLE-33 darwin_x86_64-dbg-ST-3a99c2752788
3535
CONFIGURATION-STABLE-34 darwin_x86_64-opt-ST-a99a48f137fe

0 commit comments

Comments
 (0)