Skip to content

Commit 1ab2f73

Browse files
authored
Update rules_ios to 4.4.0 for Bazel 7 support (#3018)
Updates to latest rules_ios which should support Bazel 7 Signed-off-by: Luis Padron <lpadron@squareup.com>
1 parent d9462c9 commit 1ab2f73

21 files changed

+812
-1779
lines changed

buildbuddy.yaml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -159,28 +159,29 @@ actions:
159159
<<: *action_base
160160
<<: *normal_resources
161161
<<: *examples_rules_ios_workspace
162+
bazel_commands:
163+
# Not validate since Bazel 7 Bzlmod paths are different
164+
- *generate_integration
165+
- *build_all
166+
- name: Integration Test - "examples/rules_ios" - Bazel LTS
167+
<<: *bazel_lts
168+
<<: *arm64
169+
<<: *action_base
170+
<<: *normal_resources
171+
<<: *examples_rules_ios_workspace
162172
bazel_commands:
163173
- *validate_integration
164174
- *build_all
165-
## Uncomment when rules_ios performs ObjcProvider -> CcInfo linking migration
166-
# - name: Integration Test - "examples/rules_ios" - Bazel LTS
167-
# <<: *bazel_lts
168-
# <<: *arm64
169-
# <<: *action_base
170-
# <<: *normal_resources
171-
# <<: *examples_rules_ios_workspace
172-
# bazel_commands:
173-
# - *validate_integration
174-
# - *build_all
175-
# - name: Integration Test - "examples/rules_ios" - Bazel LTS using WORKSPACE
176-
# <<: *bazel_lts
177-
# <<: *arm64
178-
# <<: *action_base
179-
# <<: *normal_resources
180-
# <<: *examples_rules_ios_workspace
181-
# bazel_commands:
182-
# - *validate_integration
183-
# - *nobzlmod_build_all
175+
- name: Integration Test - "examples/rules_ios" - Bazel LTS using WORKSPACE
176+
<<: *bazel_lts
177+
<<: *arm64
178+
<<: *action_base
179+
<<: *normal_resources
180+
<<: *examples_rules_ios_workspace
181+
bazel_commands:
182+
- *validate_integration
183+
- *nobzlmod_build_all
184+
## Uncomment once rules_ios supports Bazel 8
184185
# - name: Integration Test - "examples/rules_ios" - Bazel HEAD
185186
# <<: *bazel_head
186187
# <<: *action_base

examples/rules_ios/.bazelrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Import parent workspace settings
22
import %workspace%/../../shared.bazelrc
33

4-
# https://github.com/bazel-ios/rules_ios/issues/672
5-
build --noexperimental_strict_conflict_checks
6-
74
# rules_ios
85
build --features apple.virtualize_frameworks
96
build --features apple.arm64_simulator_use_device_deps

examples/rules_ios/.bazelversion

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/rules_ios/.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../.bazelversion

examples/rules_ios/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bazel_dep(
2020
)
2121
bazel_dep(
2222
name = "rules_ios",
23-
version = "4.2.1",
23+
version = "4.4.0",
2424
repo_name = "build_bazel_rules_ios",
2525
)
2626

examples/rules_ios/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22

33
http_archive(
44
name = "build_bazel_rules_ios",
5-
sha256 = "8b7ad824844b6e8531ecf53786a0171f0ac937e659b5371aeefd24cda2d382de",
6-
url = "https://github.com/bazel-ios/rules_ios/releases/download/4.2.1/rules_ios.4.2.1.tar.gz",
5+
sha256 = "eccb4509a820204b80260bde9f5d6ec989d5dd12fdc96fc480bd39c7ff5596d6",
6+
url = "https://github.com/bazel-ios/rules_ios/releases/download/4.4.0/rules_ios.4.4.0.tar.gz",
77
)
88

99
load(
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-4f3eb708b2ee
2-
ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-STABLE-1 ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-50ee0f59dfee
3-
ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-STABLE-2 ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-73a919da921b
4-
applebin_ios-ios_x86_64-dbg-STABLE-3 applebin_ios-ios_x86_64-dbg-ST-8e1beef5c589
5-
applebin_ios-ios_arm64-dbg-STABLE-4 applebin_ios-ios_arm64-dbg-ST-1a4b65bc4514
1+
CONFIGURATION-STABLE-0 darwin_x86_64-dbg-ST-be7f5aba7665
2+
CONFIGURATION-STABLE-1 ios_x86_64-dbg-ios-x86_64-min15.0-applebin_ios-ST-088bed176d5b
3+
CONFIGURATION-STABLE-2 ios_arm64-dbg-ios-arm64-min15.0-applebin_ios-ST-d55afcf5652b
4+
CONFIGURATION-STABLE-3 ios_x86_64-dbg-ios-x86_64-applebin_ios-ST-aacfc021bddd

examples/rules_ios/test/fixtures/bwb.xcodeproj/project.pbxproj

Lines changed: 531 additions & 997 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/rules_ios/test/fixtures/bwb.xcodeproj/rules_xcodeproj/external.xcfilelist

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/rules_ios/test/fixtures/bwb.xcodeproj/rules_xcodeproj/generated.xcfilelist

Lines changed: 19 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)