From 612f67eb252daab1e34516c1e257d301b21877d5 Mon Sep 17 00:00:00 2001
From: sureshe456 <160699174+sureshe456@users.noreply.github.com>
Date: Fri, 18 Jul 2025 14:52:41 +0530
Subject: [PATCH] [macOS] Pin kotlin to latest version(2.2.0) (#12610)

* unpin kotlin to 2.1.10 version

* # Avoid version call, use -help instead to avoid IR errors
---
 images/macos/scripts/build/install-common-utils.sh | 9 ---------
 images/macos/scripts/tests/BasicTools.Tests.ps1    | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh
index df25bbc6f..d5aa90133 100644
--- a/images/macos/scripts/build/install-common-utils.sh
+++ b/images/macos/scripts/build/install-common-utils.sh
@@ -15,15 +15,6 @@ for package in $common_packages; do
             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"
-            ;;
-
         cmake)
             # Pin cmake bottle to 3.31.6 due to a backward compatibility issue with the latest version
             # https://github.com/actions/runner-images/issues/11926
diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1
index 357e65eda..a86d71a53 100644
--- a/images/macos/scripts/tests/BasicTools.Tests.ps1
+++ b/images/macos/scripts/tests/BasicTools.Tests.ps1
@@ -133,7 +133,7 @@ Describe "Kotlin" {
     $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlinc-js")
 
     It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) {
-        "$toolName -version" | Should -ReturnZeroExitCode
+        "$toolName -help" | Should -ReturnZeroExitCode
     }
 }