Skip to content
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

build: bazel 5.2.0 #623

Merged
merged 2 commits into from
Jun 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.0
5.2.0
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bazel_skylib_workspace()

load("@bazel_skylib//lib:versions.bzl", "versions")

versions.check(minimum_bazel_version = "4.2.1")
versions.check(minimum_bazel_version = "5.2.0")

http_archive(
name = "rules_pkg",
Expand Down Expand Up @@ -345,8 +345,8 @@ http_archive(
"@com_google_mediapipe//third_party:build_bazel_rules_apple_bypass_test_runner_check.diff",
"@//third_party:build_bazel_rules_apple_validation.diff",
],
sha256 = "77e8bf6fda706f420a55874ae6ee4df0c9d95da6c7838228b26910fc82eea5a2",
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.32.0/rules_apple.0.32.0.tar.gz",
sha256 = "36072d4f3614d309d6a703da0dfe48684ec4c65a89611aeb9590b45af7a3e592",
url = "https://github.com/bazelbuild/rules_apple/releases/download/1.0.1/rules_apple.1.0.1.tar.gz",
)

load(
Expand Down
20 changes: 15 additions & 5 deletions third_party/build_bazel_rules_apple_validation.diff
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
diff --git a/apple/internal/entitlements_support.bzl b/apple/internal/entitlements_support.bzl
index 83b1bad0..fe77c687 100644
--- a/apple/internal/entitlements_support.bzl
+++ b/apple/internal/entitlements_support.bzl
@@ -389,4 +389,5 @@ def _process_entitlements(

entitlements_support = struct(
process_entitlements = _process_entitlements,
+ validate_bundle_id = _validate_bundle_id,
)
diff --git a/apple/internal/ios_rules.bzl b/apple/internal/ios_rules.bzl
index fcf84bd0..f040baa8 100644
index 23e00090..9428e1a6 100644
--- a/apple/internal/ios_rules.bzl
+++ b/apple/internal/ios_rules.bzl
@@ -646,6 +646,7 @@ def _ios_framework_impl(ctx):
apple_toolchain_info = ctx.attr._toolchain[AppleSupportToolchainInfo]
@@ -684,6 +684,7 @@ def _ios_framework_impl(ctx):
apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
bin_root_path = ctx.bin_dir.path
bundle_id = ctx.attr.bundle_id
+ bundling_support.validate_bundle_id(bundle_id)
+ entitlements_support.validate_bundle_id(bundle_id)
bundle_name, bundle_extension = bundling_support.bundle_full_name_from_rule_ctx(ctx)
executable_name = bundling_support.executable_name(ctx)
entitlements = entitlements_support.entitlements(
features = features_support.compute_enabled_features(