Skip to content

Commit 39b3cbb

Browse files
josephperrottthePunderWoman
authored andcommitted
build: update .bazelversion (angular#40579)
Update to the latest version of bazel. `4.0.0` introduced a breaking change on unnecessary backslashes and these instance are corrected in this change. PR Close angular#40579
1 parent ffad040 commit 39b3cbb

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
3.6.0
1+
4.0.0
22
# [NB: this comment has to be after the first line, see https://github.com/bazelbuild/bazelisk/issues/117]
33
# When updating the Bazel version you also need to update the RBE toolchains version in package.bzl

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ rbe_autoconfig(
7676
# Need to specify a base container digest in order to ensure that we can use the checked-in
7777
# platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
7878
# need to pull the image and run it in order determine the toolchain configuration. See:
79-
# https://github.com/bazelbuild/bazel-toolchains/blob/3.6.0/configs/ubuntu16_04_clang/versions.bzl
79+
# https://github.com/bazelbuild/bazel-toolchains/blob/4.0.0/configs/ubuntu16_04_clang/versions.bzl
8080
base_container_digest = "sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1",
8181
# Note that if you change the `digest`, you might also need to update the
8282
# `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>

dev-infra/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pkg_npm(
5858
# This substitution is particularly verbose because we need to make sure
5959
# that only things available via Angular Bazel are imported from
6060
# tools/defaults.bzl.
61-
"load\(\"//tools:defaults.bzl\", \"ng_module\"\)": "load(\"@npm//@angular/bazel:index.bzl\", \"ng_module\")",
61+
"load(\"//tools:defaults.bzl\", \"ng_module\")": "load(\"@npm//@angular/bazel:index.bzl\", \"ng_module\")",
6262
},
6363
visibility = ["//visibility:public"],
6464
deps = [

packages/bazel/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pkg_npm(
1717
"//packages/bazel/docs",
1818
],
1919
substitutions = {
20-
"(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "",
20+
"(#|//)\\s+BEGIN-DEV-ONLY[\\w\\W]+?(#|//)\\s+END-DEV-ONLY": "",
2121
"//packages/bazel/": "//@angular/bazel/",
2222
"@npm//@bazel/typescript/internal:": "//@bazel/typescript/internal:",
2323
},

packages/bazel/package.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ def rules_angular_dev_dependencies():
2929
_maybe(
3030
http_archive,
3131
name = "bazel_toolchains",
32-
sha256 = "4fb3ceea08101ec41208e3df9e56ec72b69f3d11c56629d6477c0ff88d711cf7",
33-
strip_prefix = "bazel-toolchains-3.6.0",
32+
sha256 = "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f",
33+
strip_prefix = "bazel-toolchains-4.0.0",
3434
urls = [
35-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.6.0/bazel-toolchains-3.6.0.tar.gz",
36-
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.6.0/bazel-toolchains-3.6.0.tar.gz",
35+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
36+
"https://github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
3737
],
3838
)
3939

packages/common/locales/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pkg_npm(
2323
# dependencies in case require was called.
2424
# We don't actually import anything in the locale code so we can
2525
# null out the require reference passed into the module.
26-
"factory\(require, exports\)": "factory(null, exports)",
26+
"factory\\(require, exports\\)": "factory(null, exports)",
2727
},
2828
deps = [":locales"],
2929
)

packages/private/testing/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ ng_module(
3030
genrule(
3131
name = "angular_ivy_enabled",
3232
outs = ["src/angular_ivy_enabled.ts"],
33-
cmd = "echo export const ivyEnabled = \"'True'.toString() == '$(angular_ivy_enabled)'\"\; > $@",
33+
cmd = "echo export const ivyEnabled = \"'True'.toString() == '$(angular_ivy_enabled)'\" > $@",
3434
)

0 commit comments

Comments
 (0)