Skip to content

Commit 61a0fb6

Browse files
committed
Upgrade to Bazel to 3.7.2
This also upgrades us to rules_apple 0.21.2, rules_swift 0.18.0, and ios_test_runner 0.2.14. To support this upgrade, I also added some additional patches to our pinterest/tulsi fork: - pinterest/tulsi@70f1839 - pinterest/tulsi@e8431a1 - pinterest/tulsi@c180639
1 parent f2c1a43 commit 61a0fb6

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.1
1+
3.7.2

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
44

55
PRODUCT := xchammer.app
66
XCHAMMER_APP := $(ROOT_DIR)/bazel-bin/xchammer_archive-root/xchammer.app
7-
XCHAMMER_BIN := $(XCHAMMER_APP)/Contents/MacOS/XCHammer
7+
XCHAMMER_BIN := $(XCHAMMER_APP)/Contents/MacOS/xchammer
88

99
PREFIX := /usr/local
1010

WORKSPACE

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

77
http_archive(
88
name = "build_bazel_rules_apple",
9-
sha256 = "55f4dc1c9bf21bb87442665f4618cff1f1343537a2bd89252078b987dcd9c382",
10-
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.20.0/rules_apple.0.20.0.tar.gz",
9+
sha256 = "a41a75c291c69676b9974458ceee09aea60cee0e1ee282e27cdc90b679dfd30f",
10+
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.21.2/rules_apple.0.21.2.tar.gz",
1111
)
1212

1313
load(
@@ -19,8 +19,8 @@ apple_rules_dependencies()
1919

2020
http_archive(
2121
name = "build_bazel_rules_swift",
22-
sha256 = "cea22c0616d797e494d7844a9b604520c87f53c81de49613a7e679ec5b821620",
23-
url = "https://github.com/bazelbuild/rules_swift/releases/download/0.14.0/rules_swift.0.14.0.tar.gz",
22+
sha256 = "d0e5f888b2ccce42c92e6d4686b5507b4230462627f965f9d39862e11ae9fb35",
23+
url = "https://github.com/bazelbuild/rules_swift/releases/download/0.18.0/rules_swift.0.18.0.tar.gz",
2424
)
2525

2626
load(
@@ -47,7 +47,7 @@ protobuf_deps()
4747
http_file(
4848
name = "xctestrunner",
4949
executable = 1,
50-
urls = ["https://github.com/google/xctestrunner/releases/download/0.2.6/ios_test_runner.par"],
50+
urls = ["https://github.com/google/xctestrunner/releases/download/0.2.14/ios_test_runner.par"],
5151
)
5252

5353
## SPM Dependencies

third_party/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def xchammer_dependencies():
274274
new_git_repository(
275275
name = "xchammer_tulsi_aspects",
276276
remote = "https://github.com/pinterest/tulsi.git",
277-
commit = "d9f7da58ff7a620e64d695baa2179c3598333bf7",
277+
commit = "c180639af0a20779610b4cbedd47f69849479366",
278278
strip_prefix = "src/TulsiGenerator/Bazel",
279279
build_file_content = "exports_files(['tulsi'])",
280280
)

0 commit comments

Comments
 (0)