diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 240efc0c..64ee19a1 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -512,6 +512,11 @@ function Get-KotlinVersion { return "Kotlin $kotlinVersion" } +function Get-SbtVersion { + $sbtVersion = Run-Command "sbt -version" | Take-Part -Part 3 + return "Sbt $sbtVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index c4b82d9f..e9d196f7 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -99,7 +99,8 @@ $markdown += New-MDHeader "Project Management" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( (Get-MavenVersion), (Get-GradleVersion), - (Get-ApacheAntVersion) + (Get-ApacheAntVersion), + (Get-SbtVersion) ) | Sort-Object ) diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 62b73c2b..7696845d 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -175,4 +175,10 @@ Describe "Kotlin" { It " is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode } +} + +Describe "sbt" { + It "sbt" { + "sbt -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 a21440e7..20402349 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -261,6 +261,7 @@ "packer", "parallel", "perl", + "sbt", "subversion", "swiftformat", "swig", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 9e980d34..76971fb4 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -212,6 +212,7 @@ "packer", "parallel", "perl", + "sbt", "subversion", "swiftformat", "swig", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 313e37f2..4e64229f 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -158,6 +158,7 @@ "p7zip", "packer", "perl", + "sbt", "subversion", "swiftformat", "swig",