diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index e85a47ec..a1a78517 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -507,6 +507,11 @@ function Get-BicepVersion { return "Bicep CLI $bicepVersion" } +function Get-KotlinVersion { + $kotlinVersion = Run-Command "kotlin -version" | Take-Part -Part 2 + return "kotlin $kotlinVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 8321bd85..c4b82d9f 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -43,7 +43,8 @@ $languageAndRuntimeList = @( (Get-DotnetVersionList), (Get-GoVersion), (Get-PHPVersion), - (Get-JuliaVersion) + (Get-JuliaVersion), + (Get-KotlinVersion) ) if ( -not $os.IsHighSierra) { diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index db36dbfd..e5248800 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -166,4 +166,12 @@ Describe "Homebrew" { It "Homebrew" { "brew --version" | Should -ReturnZeroExitCode } +} + +Describe "Kotlin" { + $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-js", "kotlinc-jvm", "kotlin-dce-js") + + It " is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { + "$toolName -version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index efe6cdc9..1533c723 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -244,6 +244,7 @@ "gnu-tar", "go@1.15", "helm", + "kotlin", "libpq", "llvm", "p7zip", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 4afe45be..89a41e6a 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -196,6 +196,7 @@ "gnu-tar", "go@1.15", "helm", + "kotlin", "libpq", "llvm", "p7zip", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 1568abd1..9811b656 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -143,6 +143,7 @@ "gnu-tar", "go@1.15", "helm", + "kotlin", "libpq", "llvm", "p7zip",