From 61a0fb6017297303b068492615e6a40b2d403ec1 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@pinterest.com>
Date: Mon, 27 Sep 2021 15:54:03 -0700
Subject: [PATCH] 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:

- https://github.com/pinterest/tulsi/commit/70f18391fda3feef42179442a30505401aa2a774
- https://github.com/pinterest/tulsi/commit/e8431a1f4f309e2271e8a0f1f5cd57e4c881893b
- https://github.com/pinterest/tulsi/commit/c180639af0a20779610b4cbedd47f69849479366
---
 .bazelversion                |  2 +-
 Makefile                     |  2 +-
 WORKSPACE                    | 10 +++++-----
 third_party/repositories.bzl |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.bazelversion b/.bazelversion
index 47b322c9..0b2eb36f 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.4.1
+3.7.2
diff --git a/Makefile b/Makefile
index f2784f7b..cdfec1bf 100644
--- a/Makefile
+++ b/Makefile
@@ -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
 
diff --git a/WORKSPACE b/WORKSPACE
index c9ecf8e2..067f8fd7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -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(
@@ -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(
@@ -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
diff --git a/third_party/repositories.bzl b/third_party/repositories.bzl
index ca47741b..313aeeac 100644
--- a/third_party/repositories.bzl
+++ b/third_party/repositories.bzl
@@ -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'])",
     )