From cd28898237ed6d8ead0f1571b149fcb8f7d6757f Mon Sep 17 00:00:00 2001
From: Erik Bershel <erik-bershel@github.com>
Date: Fri, 21 Mar 2025 12:50:52 +0100
Subject: [PATCH 1/3] [macOS] Remove deprecated bundle tap

---
 images/macos/scripts/build/install-homebrew.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/images/macos/scripts/build/install-homebrew.sh b/images/macos/scripts/build/install-homebrew.sh
index 4a72cf2e67..b6e3666b5d 100644
--- a/images/macos/scripts/build/install-homebrew.sh
+++ b/images/macos/scripts/build/install-homebrew.sh
@@ -38,6 +38,3 @@ brew_smart_install curl
 
 echo "Installing wget..."
 brew_smart_install "wget"
-
-# init brew bundle feature
-brew tap Homebrew/bundle

From 14b47372c982f4a3465eacb559974d73954a5dce Mon Sep 17 00:00:00 2001
From: Erik Bershel <erik-bershel@github.com>
Date: Fri, 21 Mar 2025 14:55:44 +0100
Subject: [PATCH 2/3] Pin Kotlin to 2.1.10

---
 .../scripts/build/install-common-utils.sh     | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh
index 1cbcac9544..5674202a77 100644
--- a/images/macos/scripts/build/install-common-utils.sh
+++ b/images/macos/scripts/build/install-common-utils.sh
@@ -9,19 +9,37 @@ source ~/utils/utils.sh
 common_packages=$(get_toolset_value '.brew.common_packages[]')
 for package in $common_packages; do
     echo "Installing $package..."
-    if [[ $package == "packer" ]]; then
-        # Packer has been deprecated in Homebrew. Use tap to install Packer.
-        brew install hashicorp/tap/packer
-    else
-        if (is_VenturaX64 || is_SonomaX64) && [[ $package == "tcl-tk@8" ]]; then
-            brew_smart_install "$package"
-            # Fix for https://github.com/actions/runner-images/issues/11074
-            ln -sf $(brew --prefix tcl-tk@8)/lib/libtcl8.6.dylib /usr/local/lib/libtcl8.6.dylib
-            ln -sf $(brew --prefix tcl-tk@8)/lib/libtk8.6.dylib /usr/local/lib/libtk8.6.dylib
-        else
+    case "$package" in
+        packer)
+            # Packer has been deprecated in Homebrew. Use tap to install Packer.
+            brew install hashicorp/tap/packer
+            ;;
+
+        kotlin)
+            # Pin kotlin bottle to 2.1.10 due to an issue with the latest version
+            # https://youtrack.jetbrains.com/issue/KT-76169/kotlinc-js-version-and-kapt-version-returning-non-zero-status-code-on-v2.1.20
+            kotlin_commit="442af88a2925f8c0e079eaf4fa62261133d2d7c4"
+            kotlin_rb_link="https://raw.githubusercontent.com/Homebrew/homebrew-core/$kotlin_commit/Formula/k/kotlin.rb"
+            kotlin_rb_path=$(download_with_retry "$kotlin_rb_link")
+            brew install "$kotlin_rb_path"
+            ;;
+
+        tcl-tk@8)
+            if is_VenturaX64 || is_SonomaX64; then
+                brew_smart_install "$package"
+                # Fix for https://github.com/actions/runner-images/issues/11074
+                ln -sf "$(brew --prefix tcl-tk@8)/lib/libtcl8.6.dylib" /usr/local/lib/libtcl8.6.dylib
+                ln -sf "$(brew --prefix tcl-tk@8)/lib/libtk8.6.dylib" /usr/local/lib/libtk8.6.dylib
+            else
+                brew_smart_install "$package"
+            fi
+            ;;
+
+        # Default behaviour for all other packages
+        *)
             brew_smart_install "$package"
-        fi
-    fi
+            ;;
+    esac
 done
 
 cask_packages=$(get_toolset_value '.brew.cask_packages[]')

From 129e3be3e3442bfc936aeb38b8aeeb001ae03470 Mon Sep 17 00:00:00 2001
From: Erik Bershel <erik-bershel@github.com>
Date: Fri, 21 Mar 2025 19:03:48 +0100
Subject: [PATCH 3/3] Update logic for tcl-tk

---
 images/macos/scripts/build/install-common-utils.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh
index 5674202a77..7c3a87cdef 100644
--- a/images/macos/scripts/build/install-common-utils.sh
+++ b/images/macos/scripts/build/install-common-utils.sh
@@ -25,13 +25,11 @@ for package in $common_packages; do
             ;;
 
         tcl-tk@8)
+            brew_smart_install "$package"
             if is_VenturaX64 || is_SonomaX64; then
-                brew_smart_install "$package"
                 # Fix for https://github.com/actions/runner-images/issues/11074
                 ln -sf "$(brew --prefix tcl-tk@8)/lib/libtcl8.6.dylib" /usr/local/lib/libtcl8.6.dylib
                 ln -sf "$(brew --prefix tcl-tk@8)/lib/libtk8.6.dylib" /usr/local/lib/libtk8.6.dylib
-            else
-                brew_smart_install "$package"
             fi
             ;;