From 9487f0a38c0d8d9a6c7de052294d44c4902b43a6 Mon Sep 17 00:00:00 2001
From: JP Simard <jp@jpsim.com>
Date: Thu, 6 Jan 2022 14:49:15 -0500
Subject: [PATCH] [CI] Update Xcode to 13.2.1

Release notes: https://developer.apple.com/documentation/xcode-release-notes/xcode-13_2_1-release-notes
---
 .bazelrc                              |  4 ++--
 ci/BUILD                              | 20 ++++++++++----------
 ci/mac_ci_setup.sh                    |  2 +-
 docs/root/start/building/building.rst |  3 ++-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 907b5f5819..3a3b1a60e7 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -11,11 +11,11 @@ build --features=swift.debug_prefix_map
 build --host_force_python=PY3
 build --ios_minimum_os=11.0
 build --ios_simulator_device="iPhone 13"
-build --ios_simulator_version=15.0
+build --ios_simulator_version=15.2
 build --spawn_strategy=local
 build --verbose_failures
 build --workspace_status_command=envoy/bazel/get_workspace_status
-build --xcode_version=13.0
+build --xcode_version=13.2.1
 build --host_javabase=@bazel_tools//tools/jdk:remote_jdk11
 build --javabase=@bazel_tools//tools/jdk:remote_jdk11
 build --tool_java_runtime_version=remotejdk_11
diff --git a/ci/BUILD b/ci/BUILD
index e10bc27662..3f6609f13f 100644
--- a/ci/BUILD
+++ b/ci/BUILD
@@ -1,27 +1,27 @@
 licenses(["notice"])  # Apache 2
 
 xcode_version(
-    name = "xcode_13_0",
-    default_ios_sdk_version = "15.0",
-    default_macos_sdk_version = "11.3",
-    default_tvos_sdk_version = "15.0",
-    default_watchos_sdk_version = "7.4",
-    version = "13.0",
+    name = "xcode_13_2_1",
+    default_ios_sdk_version = "15.2",
+    default_macos_sdk_version = "12.1",
+    default_tvos_sdk_version = "15.2",
+    default_watchos_sdk_version = "8.3",
+    version = "13.2.1",
 )
 
 available_xcodes(
     name = "local_xcodes",
-    default = ":xcode_13_0",
+    default = ":xcode_13_2_1",
     versions = [
-        ":xcode_13_0",
+        ":xcode_13_2_1",
     ],
 )
 
 available_xcodes(
     name = "remote_xcodes",
-    default = ":xcode_13_0",
+    default = ":xcode_13_2_1",
     versions = [
-        ":xcode_13_0",
+        ":xcode_13_2_1",
     ],
 )
 
diff --git a/ci/mac_ci_setup.sh b/ci/mac_ci_setup.sh
index b5be3f94e3..769d6bf222 100755
--- a/ci/mac_ci_setup.sh
+++ b/ci/mac_ci_setup.sh
@@ -45,7 +45,7 @@ fi
 
 pip3 install slackclient
 # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
-sudo xcode-select --switch /Applications/Xcode_13.0.app
+sudo xcode-select --switch /Applications/Xcode_13.2.1.app
 
 # Download and set up ndk 21. Github upgraded to ndk 22 for their Mac image.
 ANDROID_HOME=$ANDROID_SDK_ROOT
diff --git a/docs/root/start/building/building.rst b/docs/root/start/building/building.rst
index 734738ef7c..404dd7897f 100644
--- a/docs/root/start/building/building.rst
+++ b/docs/root/start/building/building.rst
@@ -56,7 +56,8 @@ See `ci/mac_ci_setup.sh` for the specific NDK version used during builds.
 iOS requirements
 ----------------
 
-- Xcode 13.0
+- Xcode 13.2.1
+- iOS 11.0 or later
 - Note: Requirements are listed in the :repo:`.bazelrc file <.bazelrc>` and CI scripts
 
 .. _android_aar: