From 6235233fdf2620f040d8fab3556287a142c3fff2 Mon Sep 17 00:00:00 2001
From: Keyong Han <keyonghan@google.com>
Date: Thu, 20 Apr 2023 08:37:27 -0700
Subject: [PATCH 1/2] update xcode to 14c18

---
 .ci.yaml                   | 6 +++---
 ci/builders/README.md      | 2 +-
 ci/builders/mac_unopt.json | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 91f5b37a19f1a..5b71a2a8e5cb2 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -54,7 +54,7 @@ platform_properties:
       device_type: none
       cpu: x86
       os: Mac-12
-      xcode: 14a5294e # xcode 14.0 beta 5
+      xcode: 14c18
     dimensions:
       mac_model: "Macmini8,1|Macmini9,1"
   windows:
@@ -360,7 +360,7 @@ targets:
           {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
         ]
       $flutter/osx_sdk : >-
-        { "sdk_version": "14a5294e" }
+        { "sdk_version": "14c18" }
 
   - name: Linux mac_unopt
     recipe: engine_v2/engine_v2
@@ -439,7 +439,7 @@ targets:
       release_build: "true"
       config_name: mac_ios_engine
       $flutter/osx_sdk : >-
-        { "sdk_version": "14a5294e" }
+        { "sdk_version": "14c18" }
       dependencies: >-
         [
           {"dependency": "jazzy", "version": "0.14.1"}
diff --git a/ci/builders/README.md b/ci/builders/README.md
index dd411c5cb0188..d8825911f302f 100644
--- a/ci/builders/README.md
+++ b/ci/builders/README.md
@@ -70,7 +70,7 @@ Ci\_yaml file is the glue sticking all the components together. A new build will
     properties:
       config_name: mac_android_aot_engine
       $flutter/osx_sdk : >-
-        { "sdk_version": "14a5294e" }
+        { "sdk_version": "14c18" }
 
 ```
 
diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json
index 2ef8c357246c9..9a5f6eaf82728 100644
--- a/ci/builders/mac_unopt.json
+++ b/ci/builders/mac_unopt.json
@@ -32,7 +32,7 @@
             },
             "properties": {
                 "$flutter/osx_sdk": {
-                    "sdk_version": "14a5294e"
+                    "sdk_version": "14c18"
                 }
             },
             "tests": [
@@ -65,7 +65,7 @@
                     "runtime_versions": [
                         "ios-16-0_14a5294e"
                     ],
-                    "sdk_version": "14a5294e"
+                    "sdk_version": "14c18"
                 }
             },
             "drone_dimensions": [
@@ -152,7 +152,7 @@
             },
             "properties": {
                 "$flutter/osx_sdk": {
-                    "sdk_version": "14a5294e"
+                    "sdk_version": "14c18"
                 }
             },
             "tests": []
@@ -170,7 +170,7 @@
             "properties": {
                 "$flutter/osx_sdk": {
                     "runtime_versions": [ "ios-16-0_14a5294e" ],
-                    "sdk_version": "14a5294e"
+                    "sdk_version": "14c18"
                 }
             },
             "drone_dimensions": [

From f504da5022017acded221c76f7bcd2e354dc77d4 Mon Sep 17 00:00:00 2001
From: Keyong Han <keyonghan@google.com>
Date: Thu, 20 Apr 2023 10:04:37 -0700
Subject: [PATCH 2/2] add 16-2 runtime

---
 ci/builders/mac_unopt.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json
index 9a5f6eaf82728..b9f91cd74e75e 100644
--- a/ci/builders/mac_unopt.json
+++ b/ci/builders/mac_unopt.json
@@ -63,6 +63,7 @@
             "properties": {
                 "$flutter/osx_sdk": {
                     "runtime_versions": [
+                        "ios-16-2_14c18",
                         "ios-16-0_14a5294e"
                     ],
                     "sdk_version": "14c18"
@@ -169,7 +170,10 @@
             ],
             "properties": {
                 "$flutter/osx_sdk": {
-                    "runtime_versions": [ "ios-16-0_14a5294e" ],
+                    "runtime_versions": [
+                        "ios-16-2_14c18",
+                        "ios-16-0_14a5294e"
+                    ],
                     "sdk_version": "14c18"
                 }
             },