Skip to content

Commit 612f67e

Browse files
authored
[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
1 parent 7db2ea5 commit 612f67e

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

images/macos/scripts/build/install-common-utils.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@ for package in $common_packages; do
1515
brew install hashicorp/tap/packer
1616
;;
1717

18-
kotlin)
19-
# Pin kotlin bottle to 2.1.10 due to an issue with the latest version
20-
# https://youtrack.jetbrains.com/issue/KT-76169/kotlinc-js-version-and-kapt-version-returning-non-zero-status-code-on-v2.1.20
21-
kotlin_commit="442af88a2925f8c0e079eaf4fa62261133d2d7c4"
22-
kotlin_rb_link="https://raw.githubusercontent.com/Homebrew/homebrew-core/$kotlin_commit/Formula/k/kotlin.rb"
23-
kotlin_rb_path=$(download_with_retry "$kotlin_rb_link")
24-
brew install "$kotlin_rb_path"
25-
;;
26-
2718
cmake)
2819
# Pin cmake bottle to 3.31.6 due to a backward compatibility issue with the latest version
2920
# https://github.com/actions/runner-images/issues/11926

images/macos/scripts/tests/BasicTools.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Describe "Kotlin" {
133133
$kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlinc-js")
134134

135135
It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) {
136-
"$toolName -version" | Should -ReturnZeroExitCode
136+
"$toolName -help" | Should -ReturnZeroExitCode
137137
}
138138
}
139139

0 commit comments

Comments
 (0)