From e7d299bcb4d7e77ebaff97f570d2d4cada722f45 Mon Sep 17 00:00:00 2001
From: keyonghan <54558023+keyonghan@users.noreply.github.com>
Date: Wed, 24 May 2023 18:37:29 -0700
Subject: [PATCH 1/4] Append $flutter/osx sdk property to existing
 platforms/targets relying on xcode (#42299)

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

diff --git a/.ci.yaml b/.ci.yaml
index 6a313ed6b6ef0..57a1dc9ba5d88 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -55,6 +55,12 @@ platform_properties:
       cpu: x86
       os: Mac-12
       xcode: 14a5294e # xcode 14.0 beta 5
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14a5294e"
+        }
+    dimensions:
+      mac_model: "Macmini8,1|Macmini9,1"
   windows:
     properties:
       build_host: "false"
@@ -359,6 +365,8 @@ targets:
         ]
       $flutter/osx_sdk : >-
         { "sdk_version": "14a5294e" }
+    drone_dimensions:
+      - os=Mac-12
 
   - name: Mac mac_unopt
     bringup: true
@@ -375,6 +383,15 @@ targets:
         [
           "ios-16-0_14a5294e"
         ]
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b",
+          "runtime_versions":
+            [
+              "ios-16-4_14e222b",
+              "ios-16-2_14c18"
+            ]
+        }
     timeout: 75
 
   - name: Mac Host clang-tidy

From 70c12616112b3e866ee8e1030343ac9e8ad45018 Mon Sep 17 00:00:00 2001
From: Casey Hillers <chillers@google.com>
Date: Thu, 1 Jun 2023 18:57:36 +0000
Subject: [PATCH 2/4] Release branch CI fixes

---
 ci/licenses_golden/licenses_third_party                         | 2 +-
 .../entity/contents/filters/gaussian_blur_filter_contents.cc    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
index 1d8f293918cdc..3af917df018fa 100644
--- a/ci/licenses_golden/licenses_third_party
+++ b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: 23b30509c138d889f9a9c70dcf935f30
+Signature: 4ac8e824ea80e13cc028d83aaac10029
 
 ====================================================================================================
 LIBRARY: angle
diff --git a/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc b/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
index 2bd5fe9d1fc2b..bbe1551d92bbd 100644
--- a/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
+++ b/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
@@ -337,7 +337,7 @@ std::optional<Rect> DirectionalGaussianBlurFilterContents::GetFilterCoverage(
 
   auto transform = inputs[0]->GetTransform(entity) * effect_transform.Basis();
   auto transformed_blur_vector =
-      transform.TransformDirection(blur_direction_ * Radius{blur_sigma_}.radius)
+      transform.TransformDirection(blur_direction_* Radius{blur_sigma_}.radius)
           .Abs();
   auto extent = coverage->size + transformed_blur_vector * 2;
   return Rect(coverage->origin - transformed_blur_vector,

From 833cd6440164f092196e52da9a9656cd3127cdbb Mon Sep 17 00:00:00 2001
From: Casey Hillers <chillers@google.com>
Date: Thu, 1 Jun 2023 20:00:52 +0000
Subject: [PATCH 3/4] Fix runtime version to ues branch xcode

---
 .ci.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 57a1dc9ba5d88..e01119fbc0722 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -385,11 +385,10 @@ targets:
         ]
       $flutter/osx_sdk : >-
         {
-          "sdk_version": "14e222b",
+          "sdk_version": "14a5294e",
           "runtime_versions":
             [
-              "ios-16-4_14e222b",
-              "ios-16-2_14c18"
+              "ios-16-4_14a5294e"
             ]
         }
     timeout: 75

From c221ea3ebc86f5d54e547722f98d7a26b2cbc1f8 Mon Sep 17 00:00:00 2001
From: Casey Hillers <chillers@google.com>
Date: Thu, 1 Jun 2023 20:11:55 +0000
Subject: [PATCH 4/4] Fix runtime version

---
 .ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci.yaml b/.ci.yaml
index e01119fbc0722..18c7d96ac8fce 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -388,7 +388,7 @@ targets:
           "sdk_version": "14a5294e",
           "runtime_versions":
             [
-              "ios-16-4_14a5294e"
+              "ios-16-0_14a5294e"
             ]
         }
     timeout: 75