From 343dee46226263355c5bc2c9edc4702d935ad147 Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Thu, 19 Dec 2024 01:29:01 -0800
Subject: [PATCH] Use the `xcode-16.2-macos-14.7.1-v1` CI image (#23894)

---
 .buildkite/shared-pipeline-vars | 3 +--
 .xcode-version                  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars
index 9b654cb452f8..5f16b165204a 100755
--- a/.buildkite/shared-pipeline-vars
+++ b/.buildkite/shared-pipeline-vars
@@ -7,6 +7,5 @@
 XCODE_VERSION=$(sed -E 's/^~> ?//' .xcode-version)
 CI_TOOLKIT_PLUGIN_VERSION="3.7.1"
 
-# Note: `-v4` suffix was added to use xcode-16.1-v4 image; remember to remove that suffix during the next Xcode update
-export IMAGE_ID="xcode-$XCODE_VERSION-v4"
+export IMAGE_ID="xcode-$XCODE_VERSION-macos-14.7.1-v1"
 export CI_TOOLKIT_PLUGIN="automattic/a8c-ci-toolkit#$CI_TOOLKIT_PLUGIN_VERSION"
diff --git a/.xcode-version b/.xcode-version
index c32b0ec5abde..f6eb05e3c63d 100644
--- a/.xcode-version
+++ b/.xcode-version
@@ -1 +1 @@
-16.1
+16.2