From c9c7250dd4c0255dcc5219f31e692ec15658ff9a Mon Sep 17 00:00:00 2001
From: jax authors <google-ml-automation@google.com>
Date: Wed, 26 Feb 2025 05:31:55 -0800
Subject: [PATCH] Upgrade to Bazel 7.4.1

PiperOrigin-RevId: 731278247
---
 .bazelrc             |  6 ++++++
 .bazelversion        |  2 +-
 build/tools/utils.py | 26 +++++++++++++-------------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index d7d98693e..2a9bd85fe 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,6 +1,12 @@
 # #############################################################################
 # All default build options below. These apply to all build commands.
 # #############################################################################
+# TODO: Enable Bzlmod
+common --noenable_bzlmod
+
+# TODO: Migrate for https://github.com/bazelbuild/bazel/issues/7260
+common --noincompatible_enable_cc_toolchain_resolution
+
 # Make Bazel print out all options from rc files.
 common --announce_rc
 
diff --git a/.bazelversion b/.bazelversion
index f22d756da..815da58b7 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.4.1
diff --git a/build/tools/utils.py b/build/tools/utils.py
index 255dd98f4..e91b2d424 100644
--- a/build/tools/utils.py
+++ b/build/tools/utils.py
@@ -28,44 +28,44 @@ import urllib.request
 
 logger = logging.getLogger(__name__)
 
-BAZEL_BASE_URI = "https://github.com/bazelbuild/bazel/releases/download/6.5.0/"
+BAZEL_BASE_URI = "https://github.com/bazelbuild/bazel/releases/download/7.4.1/"
 BazelPackage = collections.namedtuple(
     "BazelPackage", ["base_uri", "file", "sha256"]
 )
 bazel_packages = {
     ("Linux", "x86_64"): BazelPackage(
         base_uri=None,
-        file="bazel-6.5.0-linux-x86_64",
+        file="bazel-7.4.1-linux-x86_64",
         sha256=(
-            "a40ac69263440761199fcb8da47ad4e3f328cbe79ffbf4ecc14e5ba252857307"
+            "c97f02133adce63f0c28678ac1f21d65fa8255c80429b588aeeba8a1fac6202b"
         ),
     ),
     ("Linux", "aarch64"): BazelPackage(
         base_uri=None,
-        file="bazel-6.5.0-linux-arm64",
+        file="bazel-7.4.1-linux-arm64",
         sha256=(
-            "5afe973cadc036496cac66f1414ca9be36881423f576db363d83afc9084c0c2f"
+            "d7aedc8565ed47b6231badb80b09f034e389c5f2b1c2ac2c55406f7c661d8b88"
         ),
     ),
     ("Darwin", "x86_64"): BazelPackage(
         base_uri=None,
-        file="bazel-6.5.0-darwin-x86_64",
+        file="bazel-7.4.1-darwin-x86_64",
         sha256=(
-            "bbf9c2c03bac48e0514f46db0295027935535d91f6d8dcd960c53393559eab29"
+            "52dd34c17cc97b3aa5bdfe3d45c4e3938226f23dd0bfb47beedd625a953f1f05"
         ),
     ),
     ("Darwin", "arm64"): BazelPackage(
         base_uri=None,
-        file="bazel-6.5.0-darwin-arm64",
+        file="bazel-7.4.1-darwin-arm64",
         sha256=(
-            "c6b6dc17efcdf13fba484c6fe0b6c3361b888ae7b9573bc25a2dbe8c502448eb"
+            "02b117b97d0921ae4d4f4e11d27e2c0930381df416e373435d5d0419c6a26f24"
         ),
     ),
     ("Windows", "AMD64"): BazelPackage(
         base_uri=None,
-        file="bazel-6.5.0-windows-x86_64.exe",
+        file="bazel-7.4.1-windows-x86_64.exe",
         sha256=(
-            "6eae8e7f28e1b68b833503d1a58caf139c11e52de19df0d787d974653a0ea4c6"
+            "4a76eddf6c5115e1d93355fd11db5ac2fc20e58f197f5d65d3f21da92aa0925b"
         ),
     ),
 }
@@ -137,7 +137,7 @@ def get_bazel_paths(bazel_path_flag):
 def get_bazel_path(bazel_path_flag):
   """Returns the path to a Bazel binary, downloading Bazel if not found.
 
-  Also, checks Bazel's version is at least newer than 6.5.0
+  Also, checks Bazel's version is at least newer than 7.4.1
 
   A manual version check is needed only for really old bazel versions.
   Newer bazel releases perform their own version check against .bazelversion
@@ -151,7 +151,7 @@ def get_bazel_path(bazel_path_flag):
 
   print(
       "Cannot find or download a suitable version of bazel."
-      "Please install bazel >= 6.5.0."
+      "Please install bazel >= 7.4.1."
   )
   sys.exit(-1)