From 3eecc217cf09ae5e7a08f4b49ae9fb3fa3dd43b7 Mon Sep 17 00:00:00 2001
From: keyonghan <54558023+keyonghan@users.noreply.github.com>
Date: Thu, 25 May 2023 15:47:31 -0700
Subject: [PATCH] Append $flutter/osx sdk property to existing
 platforms/targets relying on xcode (#127537)

Part of https://github.com/flutter/flutter/issues/127534
---
 .ci.yaml | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/.ci.yaml b/.ci.yaml
index f264e0e792a..47cd4488843 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -79,6 +79,10 @@ platform_properties:
       os: Mac-12
       device_type: none
       xcode: 14e222b
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
   mac_arm64:
     properties:
       dependencies: >-
@@ -89,6 +93,10 @@ platform_properties:
       device_type: none
       cpu: arm64
       xcode: 14e222b
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
   mac_benchmark:
     properties:
       dependencies: >-
@@ -98,9 +106,13 @@ platform_properties:
       device_type: none
       mac_model: "Macmini8,1"
       os: Mac-12
+      xcode: 14e222b
       tags: >
         ["devicelab", "hostonly", "mac"]
-      xcode: 14e222b
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
   mac_x64:
     properties:
       dependencies: >-
@@ -111,6 +123,10 @@ platform_properties:
       device_type: none
       cpu: x86
       xcode: 14e222b
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
   mac_build_test:
     properties:
       dependencies: >-
@@ -123,6 +139,10 @@ platform_properties:
       device_type: none
       cpu: x86
       xcode: 14e222b
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
   mac_android:
     properties:
       dependencies: >-
@@ -156,6 +176,10 @@ platform_properties:
       cpu: x86
       device_os: iOS-16
       xcode: 14e222b
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
   mac_arm64_ios:
     properties:
       dependencies: >-
@@ -168,6 +192,10 @@ platform_properties:
       cpu: arm64
       device_os: iOS-16
       xcode: 14e222b
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
   windows:
     properties:
       dependencies: >-
@@ -2526,6 +2554,10 @@ targets:
           {"dependency": "gems", "version": "v3.3.14"}
         ]
       task_name: animated_complex_opacity_perf_macos__e2e_summary
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
 
   - name: Mac_benchmark basic_material_app_macos__compile
     presubmit: false
@@ -2537,6 +2569,10 @@ targets:
           {"dependency": "xcode", "version": "14e222b"}
         ]
       task_name: basic_material_app_macos__compile
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
 
   - name: Mac build_ios_framework_module_test
     recipe: devicelab/devicelab_drone
@@ -2550,6 +2586,10 @@ targets:
       tags: >
         ["devicelab", "hostonly", "mac"]
       task_name: build_ios_framework_module_test
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -2657,6 +2697,10 @@ targets:
           {"dependency": "gems", "version": "v3.3.14"}
         ]
       task_name: complex_layout_macos__start_up
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
 
   - name: Mac_benchmark complex_layout_scroll_perf_macos__timeline_summary
     presubmit: false
@@ -2669,6 +2713,10 @@ targets:
           {"dependency": "gems", "version": "v3.3.14"}
         ]
       task_name: complex_layout_scroll_perf_macos__timeline_summary
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
 
   - name: Mac customer_testing
     enabled_branches:
@@ -2710,6 +2758,10 @@ targets:
           {"dependency": "gems", "version": "v3.3.14"}
         ]
       task_name: flutter_gallery_macos__compile
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
 
   - name: Mac_benchmark flutter_gallery_macos__start_up
     presubmit: false
@@ -2722,6 +2774,10 @@ targets:
           {"dependency": "gems", "version": "v3.3.14"}
         ]
       task_name: flutter_gallery_macos__start_up
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
 
   - name: Mac flutter_packaging_test
     recipe: packaging/packaging
@@ -2757,6 +2813,10 @@ targets:
           {"dependency": "xcode", "version": "14e222b"}
         ]
       task_name: flutter_view_macos__start_up
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
 
   - name: Mac framework_tests_libraries
     recipe: flutter/flutter_drone
@@ -2866,6 +2926,10 @@ targets:
           {"dependency": "xcode", "version": "14e222b"}
         ]
       task_name: hello_world_macos__compile
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
 
   - name: Mac integration_ui_test_test_macos
     recipe: devicelab/devicelab_drone
@@ -2978,6 +3042,10 @@ targets:
           {"dependency": "xcode", "version": "14e222b"}
         ]
       task_name: platform_view_macos__start_up
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
 
   - name: Mac platform_channel_sample_test_macos
     recipe: devicelab/devicelab_drone