Skip to content

Commit

Permalink
Update rules_ios to 4.4.0 for Bazel 7 support (#3018)
Browse files Browse the repository at this point in the history
Updates to latest rules_ios which should support Bazel 7

Signed-off-by: Luis Padron <[email protected]>
  • Loading branch information
luispadron authored Apr 19, 2024
1 parent d9462c9 commit 1ab2f73
Show file tree
Hide file tree
Showing 21 changed files with 812 additions and 1,779 deletions.
39 changes: 20 additions & 19 deletions buildbuddy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -159,28 +159,29 @@ actions:
<<: *action_base
<<: *normal_resources
<<: *examples_rules_ios_workspace
bazel_commands:
# Not validate since Bazel 7 Bzlmod paths are different
- *generate_integration
- *build_all
- name: Integration Test - "examples/rules_ios" - Bazel LTS
<<: *bazel_lts
<<: *arm64
<<: *action_base
<<: *normal_resources
<<: *examples_rules_ios_workspace
bazel_commands:
- *validate_integration
- *build_all
## Uncomment when rules_ios performs ObjcProvider -> CcInfo linking migration
# - name: Integration Test - "examples/rules_ios" - Bazel LTS
# <<: *bazel_lts
# <<: *arm64
# <<: *action_base
# <<: *normal_resources
# <<: *examples_rules_ios_workspace
# bazel_commands:
# - *validate_integration
# - *build_all
# - name: Integration Test - "examples/rules_ios" - Bazel LTS using WORKSPACE
# <<: *bazel_lts
# <<: *arm64
# <<: *action_base
# <<: *normal_resources
# <<: *examples_rules_ios_workspace
# bazel_commands:
# - *validate_integration
# - *nobzlmod_build_all
- name: Integration Test - "examples/rules_ios" - Bazel LTS using WORKSPACE
<<: *bazel_lts
<<: *arm64
<<: *action_base
<<: *normal_resources
<<: *examples_rules_ios_workspace
bazel_commands:
- *validate_integration
- *nobzlmod_build_all
## Uncomment once rules_ios supports Bazel 8
# - name: Integration Test - "examples/rules_ios" - Bazel HEAD
# <<: *bazel_head
# <<: *action_base
Expand Down
3 changes: 0 additions & 3 deletions examples/rules_ios/.bazelrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Import parent workspace settings
import %workspace%/../../shared.bazelrc

# https://github.com/bazel-ios/rules_ios/issues/672
build --noexperimental_strict_conflict_checks

# rules_ios
build --features apple.virtualize_frameworks
build --features apple.arm64_simulator_use_device_deps
Expand Down
1 change: 0 additions & 1 deletion examples/rules_ios/.bazelversion

This file was deleted.

1 change: 1 addition & 0 deletions examples/rules_ios/.bazelversion
2 changes: 1 addition & 1 deletion examples/rules_ios/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ bazel_dep(
)
bazel_dep(
name = "rules_ios",
version = "4.2.1",
version = "4.4.0",
repo_name = "build_bazel_rules_ios",
)

Expand Down
4 changes: 2 additions & 2 deletions examples/rules_ios/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

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

load(
Expand Down
9 changes: 4 additions & 5 deletions examples/rules_ios/test/fixtures/bazel-7/bwb_replacements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-4f3eb708b2ee
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
ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-STABLE-2 ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-73a919da921b
applebin_ios-ios_x86_64-dbg-STABLE-3 applebin_ios-ios_x86_64-dbg-ST-8e1beef5c589
applebin_ios-ios_arm64-dbg-STABLE-4 applebin_ios-ios_arm64-dbg-ST-1a4b65bc4514
CONFIGURATION-STABLE-0 darwin_x86_64-dbg-ST-be7f5aba7665
CONFIGURATION-STABLE-1 ios_x86_64-dbg-ios-x86_64-min15.0-applebin_ios-ST-088bed176d5b
CONFIGURATION-STABLE-2 ios_arm64-dbg-ios-arm64-min15.0-applebin_ios-ST-d55afcf5652b
CONFIGURATION-STABLE-3 ios_x86_64-dbg-ios-x86_64-applebin_ios-ST-aacfc021bddd
1,528 changes: 531 additions & 997 deletions examples/rules_ios/test/fixtures/bwb.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1ab2f73

Please sign in to comment.