From b61d0b0fca3f96df31805058f39bbfb47abb0d3a Mon Sep 17 00:00:00 2001
From: Liang Ma <lma@pinterest.com>
Date: Wed, 26 Jan 2022 17:34:07 -0800
Subject: [PATCH 1/5] pick Tulsi dSYM change
 818e0ef72a746710b57f4e23715a020f27898e91

---
 third_party/repositories.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/repositories.bzl b/third_party/repositories.bzl
index 51620b0..127e8a9 100644
--- a/third_party/repositories.bzl
+++ b/third_party/repositories.bzl
@@ -258,7 +258,7 @@ def xchammer_dependencies():
     namespaced_git_repository(
         name = "Tulsi",
         remote = "https://github.com/pinterest/tulsi.git",
-        commit = "370460774377d0f931c41eb2562c0b79caf94b40",
+        commit = "818e0ef72a746710b57f4e23715a020f27898e91",
         patch_cmds = [
             """
          sed -i '' 's/\\:__subpackages__/visibility\\:public/g' src/TulsiGenerator/BUILD

From d55ea16745c899d255dedcdcb4e5847f4888c5f0 Mon Sep 17 00:00:00 2001
From: Liang Ma <lma@pinterest.com>
Date: Wed, 26 Jan 2022 19:15:41 -0800
Subject: [PATCH 2/5] update bazel dependencies to latest version

---
 .bazelrc      |  4 +---
 .bazelversion |  2 +-
 WORKSPACE     | 15 +++++++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 5106cf9..5c32d71 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -11,6 +11,4 @@ build \
  --swiftcopt=-Xwrapped-swift=-debug-prefix-pwd-is-dot \
  --experimental_strict_action_env=true \
  --cpu darwin_x86_64 \
- --experimental_show_artifacts \
- --incompatible_objc_compile_info_migration=true \
- --incompatible_objc_provider_remove_compile_info=true
+ --experimental_show_artifacts 
diff --git a/.bazelversion b/.bazelversion
index 47b322c..0062ac9 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.4.1
+5.0.0
diff --git a/WORKSPACE b/WORKSPACE
index c9ecf8e..e3c1768 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 = "a5f00fd89eff67291f6cd3efdc8fad30f4727e6ebb90718f3f05bbf3c3dd5ed7",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.33.0/rules_apple.0.33.0.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",
+    url = "https://github.com/bazelbuild/rules_swift/releases/download/0.25.0/rules_swift.0.25.0.tar.gz",
+    sha256 = "8a49da750560b185804a4bc95c82d3f9cc4c2caf788960b0e21945759155fdd9",
 )
 
 load(
@@ -30,6 +30,13 @@ load(
 
 swift_rules_dependencies()
 
+load(
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
+)
+
+swift_rules_extra_dependencies()
+
 load(
     "@build_bazel_apple_support//lib:repositories.bzl",
     "apple_support_dependencies",

From 6bc4730bfba446a57208fcf36bd8866773f5c32c Mon Sep 17 00:00:00 2001
From: OliverKoo <okoo@pinterest.com>
Date: Tue, 22 Mar 2022 13:29:57 -0700
Subject: [PATCH 3/5] update tulsi to latest to include deprecation of python2
 and switch to python3

---
 third_party/repositories.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/repositories.bzl b/third_party/repositories.bzl
index 127e8a9..2bd0a3d 100644
--- a/third_party/repositories.bzl
+++ b/third_party/repositories.bzl
@@ -258,7 +258,7 @@ def xchammer_dependencies():
     namespaced_git_repository(
         name = "Tulsi",
         remote = "https://github.com/pinterest/tulsi.git",
-        commit = "818e0ef72a746710b57f4e23715a020f27898e91",
+        commit = "9fb0df4ca7838cf794c2891869385b7e49860544",
         patch_cmds = [
             """
          sed -i '' 's/\\:__subpackages__/visibility\\:public/g' src/TulsiGenerator/BUILD

From 4617fc100eb0a35860dbbebd3a88587af5cfbcf0 Mon Sep 17 00:00:00 2001
From: OliverKoo <okoo@pinterest.com>
Date: Thu, 24 Mar 2022 13:52:18 -0700
Subject: [PATCH 4/5] pull in updated Tulsi to include
 https://github.com/bazelbuild/tulsi/commit/270eae09f5577517b817fa35ca2b89b7e0d89475

---
 third_party/repositories.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/repositories.bzl b/third_party/repositories.bzl
index 2bd0a3d..24289b2 100644
--- a/third_party/repositories.bzl
+++ b/third_party/repositories.bzl
@@ -258,7 +258,7 @@ def xchammer_dependencies():
     namespaced_git_repository(
         name = "Tulsi",
         remote = "https://github.com/pinterest/tulsi.git",
-        commit = "9fb0df4ca7838cf794c2891869385b7e49860544",
+        commit = "769231b3c4d572f3cc60d2868c4afc72b7c10e5c",
         patch_cmds = [
             """
          sed -i '' 's/\\:__subpackages__/visibility\\:public/g' src/TulsiGenerator/BUILD

From 60ae17d1c4283b00fa5ab97ff71bf57c32ce4cfd Mon Sep 17 00:00:00 2001
From: OliverKoo <okoo@pinterest.com>
Date: Thu, 24 Mar 2022 14:54:22 -0700
Subject: [PATCH 5/5] update swiftc_stub.py to use py3

---
 XCHammerAssets/swiftc_stub.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/XCHammerAssets/swiftc_stub.py b/XCHammerAssets/swiftc_stub.py
index 8a4ad5c..74adca6 100755
--- a/XCHammerAssets/swiftc_stub.py
+++ b/XCHammerAssets/swiftc_stub.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 try:
     from typing import List
 except ImportError: