From 45fbba41f5345589858a3e31f9728f05336b9206 Mon Sep 17 00:00:00 2001
From: Luis Padron <lpadron@squareup.com>
Date: Mon, 4 Mar 2024 22:51:19 -0500
Subject: [PATCH] Add 7.0.2 as a tested Bazel version in CI

---
 .bazelversion               |  2 +-
 .github/workflows/tests.yml | 18 ++++++++++++------
 MODULE.bazel                |  4 ----
 README.md                   |  1 +
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.bazelversion b/.bazelversion
index f22d756d..a3fcc712 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.5.0
+7.1.0
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fd9b8a0e..33397998 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,8 +18,9 @@ jobs:
     name: Build and test (Bazel ${{ matrix.bazel_version }} / Xcode ${{ matrix.xcode_version }} / Virtual Frameworks ${{ matrix.virtual_frameworks }})
     runs-on: macos-14
     strategy:
+      fail-fast: false
       matrix:
-        bazel_version: [6.5.0]
+        bazel_version: [6.5.0, 7.1.0]
         xcode_version: [15.2]
         virtual_frameworks: [true, false]
     env:
@@ -63,8 +64,9 @@ jobs:
     name: arm64 Simulator (Bazel ${{ matrix.bazel_version }} / Xcode ${{ matrix.xcode_version }})
     runs-on: macos-14
     strategy:
+      fail-fast: false
       matrix:
-        bazel_version: [6.5.0]
+        bazel_version: [6.5.0, 7.1.0]
         xcode_version: [15.2]
     env:
         XCODE_VERSION: ${{ matrix.xcode_version }}
@@ -103,8 +105,9 @@ jobs:
     name: Buildifier and Documentation (Bazel ${{ matrix.bazel_version }} / Xcode ${{ matrix.xcode_version }})
     runs-on: macos-14
     strategy:
+      fail-fast: false
       matrix:
-        bazel_version: [6.5.0]
+        bazel_version: [7.1.0] # Only run on latest Bazel version as stardoc changes between versions and produces different results
         xcode_version: [15.2]
     env:
         XCODE_VERSION: ${{ matrix.xcode_version }}
@@ -133,8 +136,9 @@ jobs:
     name: Legacy xcodeproj tests (Bazel ${{ matrix.bazel_version }} / Xcode ${{ matrix.xcode_version }})
     runs-on: macos-14
     strategy:
+      fail-fast: false
       matrix:
-        bazel_version: [6.5.0]
+        bazel_version: [6.5.0]  # Only test on a single Bazel version as fixtures require updates across Bazel verisons
         xcode_version: [15.2]
     env:
         XCODE_VERSION: ${{ matrix.xcode_version }}
@@ -155,8 +159,9 @@ jobs:
     name: LLDB tests (Bazel ${{ matrix.bazel_version }} / Xcode ${{ matrix.xcode_version }})
     runs-on: macos-14
     strategy:
+      fail-fast: false
       matrix:
-        bazel_version: [6.5.0]
+        bazel_version: [6.5.0, 7.1.0]
         xcode_version: [15.2]
     env:
         XCODE_VERSION: ${{ matrix.xcode_version }}
@@ -184,8 +189,9 @@ jobs:
     name: iOS App Multiple Architectures (Bazel ${{ matrix.bazel_version }} / Xcode ${{ matrix.xcode_version }})
     runs-on: macos-14
     strategy:
+      fail-fast: false
       matrix:
-        bazel_version: [6.5.0]
+        bazel_version: [6.5.0, 7.1.0]
         xcode_version: [15.2]
     env:
         XCODE_VERSION: ${{ matrix.xcode_version }}
diff --git a/MODULE.bazel b/MODULE.bazel
index ce3cd890..4212fa23 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -9,10 +9,6 @@ module(
     version = "0",
     bazel_compatibility = [
         ">=6.0.0",
-        # Temporarily limit the usage of Bazel 7+ until
-        # https://github.com/bazel-ios/rules_ios/issues/795
-        # is complete.
-        "<7.0.0",
     ],
     compatibility_level = 1,
     repo_name = "build_bazel_rules_ios",
diff --git a/README.md b/README.md
index d498b0ff..d78756d7 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@ See the following table for supported release versions.
 
 | Bazel release | Minimum supported rules version | Final supported rules version
 |:-------------------:|:-------------------------:|:-------------------------:
+| 7.* | 4.2.0 | current
 | 6.* | 2.0.0 | current
 | 5.* | 1.0.0 | 3.2.2
 | 4.* | 1.0.0 | 1.0.0