From 9fffe8b5fcd2f0b4235d3b5d8387aae0cf67d285 Mon Sep 17 00:00:00 2001
From: Nick Cooke <nickcooke@google.com>
Date: Tue, 15 Apr 2025 11:32:43 -0400
Subject: [PATCH 1/3] [Infra] Fail on Xcode 15 builds

---
 scripts/build.sh | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 8a032e2409d..b099c43dd1a 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -151,25 +151,9 @@ function CheckUnexpectedFailures() {
   fi
 }
 
-# TODO(ncooke3): Xcode 16 – remove -lt 15 after migration
-if [[ "$xcode_major" -lt 15 ]]; then
-  ios_flags=(
-    -sdk 'iphonesimulator'
-    -destination 'platform=iOS Simulator,name=iPhone 14'
-  )
-  watchos_flags=(
-    -sdk 'watchsimulator'
-    -destination 'platform=watchOS Simulator,name=Apple Watch Series 7 (45mm)'
-  )
-elif [[ "$xcode_major" -lt 16 ]]; then
-  ios_flags=(
-    -sdk 'iphonesimulator'
-    -destination 'platform=iOS Simulator,name=iPhone 15'
-  )
-  watchos_flags=(
-    -sdk 'watchsimulator'
-    -destination 'platform=watchOS Simulator,name=Apple Watch Series 7 (45mm)'
-  )
+if [[ "$xcode_major" -lt 16 ]]; then
+  echo "Unsupported Xcode major version being used: $xcode_major"
+  exit 1
 else
   ios_flags=(
     -sdk 'iphonesimulator'

From 52860fe17289bf5ca959a13cb86516643515a286 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 15 Apr 2025 13:53:16 -0400
Subject: [PATCH 2/3] Attempt to fix CMake

---
 .github/workflows/firestore.yml | 2 +-
 scripts/build.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
index 0c59e99b556..7fdd6f182c4 100644
--- a/.github/workflows/firestore.yml
+++ b/.github/workflows/firestore.yml
@@ -114,7 +114,7 @@ jobs:
       (github.event_name == 'pull_request' && needs.changes.outputs.changed == 'true')
     strategy:
       matrix:
-        os: [macos-14, ubuntu-latest]
+        os: [macos-15, ubuntu-latest]
 
     env:
       MINT_PATH: ${{ github.workspace }}/mint
diff --git a/scripts/build.sh b/scripts/build.sh
index b099c43dd1a..4d22313bff3 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -151,7 +151,7 @@ function CheckUnexpectedFailures() {
   fi
 }
 
-if [[ "$xcode_major" -lt 16 ]]; then
+if [[ "$xcode_major" -lt 16 && "$method" != "cmake" ]]; then
   echo "Unsupported Xcode major version being used: $xcode_major"
   exit 1
 else

From c1e0fac7174faa6754679be0d7e596c1694da10f Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 15 Apr 2025 14:19:10 -0400
Subject: [PATCH 3/3] Move back to macos-14

---
 .github/workflows/firestore.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
index 7fdd6f182c4..0c59e99b556 100644
--- a/.github/workflows/firestore.yml
+++ b/.github/workflows/firestore.yml
@@ -114,7 +114,7 @@ jobs:
       (github.event_name == 'pull_request' && needs.changes.outputs.changed == 'true')
     strategy:
       matrix:
-        os: [macos-15, ubuntu-latest]
+        os: [macos-14, ubuntu-latest]
 
     env:
       MINT_PATH: ${{ github.workspace }}/mint