Skip to content

Commit

Permalink
Upgrade to Bazel to 3.7.2
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jparise committed Sep 27, 2021
1 parent f2c1a43 commit 61a0fb6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.1
3.7.2
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))

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

PREFIX := /usr/local

Expand Down
10 changes: 5 additions & 5 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")

http_archive(
name = "build_bazel_rules_apple",
sha256 = "55f4dc1c9bf21bb87442665f4618cff1f1343537a2bd89252078b987dcd9c382",
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.20.0/rules_apple.0.20.0.tar.gz",
sha256 = "a41a75c291c69676b9974458ceee09aea60cee0e1ee282e27cdc90b679dfd30f",
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.21.2/rules_apple.0.21.2.tar.gz",
)

load(
Expand All @@ -19,8 +19,8 @@ apple_rules_dependencies()

http_archive(
name = "build_bazel_rules_swift",
sha256 = "cea22c0616d797e494d7844a9b604520c87f53c81de49613a7e679ec5b821620",
url = "https://github.com/bazelbuild/rules_swift/releases/download/0.14.0/rules_swift.0.14.0.tar.gz",
sha256 = "d0e5f888b2ccce42c92e6d4686b5507b4230462627f965f9d39862e11ae9fb35",
url = "https://github.com/bazelbuild/rules_swift/releases/download/0.18.0/rules_swift.0.18.0.tar.gz",
)

load(
Expand All @@ -47,7 +47,7 @@ protobuf_deps()
http_file(
name = "xctestrunner",
executable = 1,
urls = ["https://github.com/google/xctestrunner/releases/download/0.2.6/ios_test_runner.par"],
urls = ["https://github.com/google/xctestrunner/releases/download/0.2.14/ios_test_runner.par"],
)

## SPM Dependencies
Expand Down
2 changes: 1 addition & 1 deletion third_party/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ def xchammer_dependencies():
new_git_repository(
name = "xchammer_tulsi_aspects",
remote = "https://github.com/pinterest/tulsi.git",
commit = "d9f7da58ff7a620e64d695baa2179c3598333bf7",
commit = "c180639af0a20779610b4cbedd47f69849479366",
strip_prefix = "src/TulsiGenerator/Bazel",
build_file_content = "exports_files(['tulsi'])",
)
Expand Down

0 comments on commit 61a0fb6

Please sign in to comment.