From 582f07dc1da56761879b5e4b4e2837832e0001e7 Mon Sep 17 00:00:00 2001
From: Victoria Ashworth <vashworth@google.com>
Date: Wed, 17 Jan 2024 13:31:12 -0600
Subject: [PATCH] Update tests to Xcode 15 and iOS 17 simulator

---
 .ci.yaml                                     | 8 ++++----
 .ci/scripts/create_simulator.sh              | 2 +-
 .ci/targets/ios_platform_tests.yaml          | 4 ++--
 packages/pigeon/tool/shared/test_suites.dart | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 49a6f05ea41b..96868d5a73ea 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -85,12 +85,12 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-12|Mac-13
+      os: Mac-13
       device_type: none
       cpu: arm64
       $flutter/osx_sdk : >-
         {
-          "sdk_version": "14e300c"
+          "sdk_version": "15a240d"
         }
   mac_x64:
     properties:
@@ -98,12 +98,12 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-12|Mac-13
+      os: Mac-13
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-
         {
-          "sdk_version": "14e300c"
+          "sdk_version": "15a240d"
         }
 
 targets:
diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh
index 722fb4014b0c..1932f20f3047 100755
--- a/.ci/scripts/create_simulator.sh
+++ b/.ci/scripts/create_simulator.sh
@@ -9,7 +9,7 @@ set -o pipefail
 # The name here must match remove_simulator.sh
 readonly DEVICE_NAME=Flutter-iPhone
 readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14
-readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-4
+readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-17-0
 
 # Delete any existing devices named Flutter-iPhone. Having more than one may
 # cause issues when builds target the device.
diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml
index eea677edb1c5..fa83551f076c 100644
--- a/.ci/targets/ios_platform_tests.yaml
+++ b/.ci/targets/ios_platform_tests.yaml
@@ -21,8 +21,8 @@ tasks:
     args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"]
   - name: native test
     script: script/tool_runner.sh
-    # Simulator name must match name in create_simulator.sh
-    args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=16.4"]
+    # Simulator name and version must match name and version in create_simulator.sh
+    args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=17.0"]
   - name: boot simulator
     # Ensure simulator is still booted
     script: .ci/scripts/boot_simulator.sh
diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart
index b11fc9a644c5..8f9bb7a4cb40 100644
--- a/packages/pigeon/tool/shared/test_suites.dart
+++ b/packages/pigeon/tool/shared/test_suites.dart
@@ -296,8 +296,8 @@ Future<int> _runIOSPluginUnitTests(String testPluginPath) async {
 
   const String deviceName = 'Pigeon-Test-iPhone';
   const String deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14';
-  const String deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-16-4';
-  const String deviceOS = '16.4';
+  const String deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-17-0';
+  const String deviceOS = '17.0';
   await _createSimulator(deviceName, deviceType, deviceRuntime);
   return runXcodeBuild(
     '$examplePath/ios',