Skip to content

Commit 6389495

Browse files
[MacOS] Add SBT (#4101)
1 parent 23a859a commit 6389495

File tree

6 files changed

+16
-1
lines changed

6 files changed

+16
-1
lines changed

images/macos/software-report/SoftwareReport.Common.psm1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,11 @@ function Get-KotlinVersion {
512512
return "Kotlin $kotlinVersion"
513513
}
514514

515+
function Get-SbtVersion {
516+
$sbtVersion = Run-Command "sbt -version" | Take-Part -Part 3
517+
return "Sbt $sbtVersion"
518+
}
519+
515520
function Build-PackageManagementEnvironmentTable {
516521
return @(
517522
@{

images/macos/software-report/SoftwareReport.Generator.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ $markdown += New-MDHeader "Project Management" -Level 3
9999
$markdown += New-MDList -Style Unordered -Lines (@(
100100
(Get-MavenVersion),
101101
(Get-GradleVersion),
102-
(Get-ApacheAntVersion)
102+
(Get-ApacheAntVersion),
103+
(Get-SbtVersion)
103104
) | Sort-Object
104105
)
105106

images/macos/tests/BasicTools.Tests.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,4 +175,10 @@ Describe "Kotlin" {
175175
It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) {
176176
"$toolName -version" | Should -ReturnZeroExitCode
177177
}
178+
}
179+
180+
Describe "sbt" {
181+
It "sbt" {
182+
"sbt -version" | Should -ReturnZeroExitCode
183+
}
178184
}

images/macos/toolsets/toolset-10.14.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@
261261
"packer",
262262
"parallel",
263263
"perl",
264+
"sbt",
264265
"subversion",
265266
"swiftformat",
266267
"swig",

images/macos/toolsets/toolset-10.15.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@
212212
"packer",
213213
"parallel",
214214
"perl",
215+
"sbt",
215216
"subversion",
216217
"swiftformat",
217218
"swig",

images/macos/toolsets/toolset-11.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
"p7zip",
159159
"packer",
160160
"perl",
161+
"sbt",
161162
"subversion",
162163
"swiftformat",
163164
"swig",

0 commit comments

Comments
 (0)