diff --git a/.bazelrc b/.bazelrc index 5106cf9e..5c32d714 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 47b322c9..0062ac97 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.4.1 +5.0.0 diff --git a/WORKSPACE b/WORKSPACE index c9ecf8e2..e3c17685 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", diff --git a/XCHammerAssets/swiftc_stub.py b/XCHammerAssets/swiftc_stub.py index 8a4ad5c7..74adca64 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: diff --git a/third_party/repositories.bzl b/third_party/repositories.bzl index 51620b02..24289b2e 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 = "769231b3c4d572f3cc60d2868c4afc72b7c10e5c", patch_cmds = [ """ sed -i '' 's/\\:__subpackages__/visibility\\:public/g' src/TulsiGenerator/BUILD