Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Mac OS] adding kotlin lang using brew #3777

Merged
merged 16 commits into from
Jul 29, 2021
Merged

[Mac OS] adding kotlin lang using brew #3777

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
659e2a2
select-xamarin-sdk-v2
mikhailshaganov Apr 29, 2021
02e110a
Update select-xamarin-sdk-v2.sh
mikhailshaganov Apr 29, 2021
9dfcb37
change warning message
mikhailshaganov Apr 30, 2021
c7061e7
check existed framework version
mikhailshaganov May 4, 2021
1d2a132
check framework version review points
mikhailshaganov May 4, 2021
ebb2a24
xamarin sdk
mikhailshaganov Jul 19, 2021
8bcf256
Merge branch 'main' of https://github.com/actions/virtual-environment…
mikhailshaganov Jul 19, 2021
0ae2193
Merge branch 'actions-main'
mikhailshaganov Jul 19, 2021
f8340cb
Merge branch 'actions:main' into main
mikhailshaganov Jul 22, 2021
9c09e53
kotlin mac brew
mikhailshaganov Jul 22, 2021
e005f66
fixes
mikhailshaganov Jul 22, 2021
1a28adb
fix
mikhailshaganov Jul 23, 2021
fa109f6
fix mac test
mikhailshaganov Jul 26, 2021
744446c
fix test mac
mikhailshaganov Jul 27, 2021
04b34b3
fix tests
mikhailshaganov Jul 27, 2021
c39a44c
fix toolsets
mikhailshaganov Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions images/macos/software-report/SoftwareReport.Common.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 @(
@{
Expand Down
3 changes: 2 additions & 1 deletion images/macos/software-report/SoftwareReport.Generator.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ $languageAndRuntimeList = @(
(Get-DotnetVersionList),
(Get-GoVersion),
(Get-PHPVersion),
(Get-JuliaVersion)
(Get-JuliaVersion),
(Get-KotlinVersion)
)

if ( -not $os.IsHighSierra) {
Expand Down
26 changes: 26 additions & 0 deletions images/macos/tests/BasicTools.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,30 @@ Describe "Homebrew" {
It "Homebrew" {
"brew --version" | Should -ReturnZeroExitCode
}
}

Describe "Kotlin" {
It "kapt" {
"kapt -version" | Should -ReturnZeroExitCode
}

It "kotlin" {
"kotlin -version" | Should -ReturnZeroExitCode
}
mikhailshaganov marked this conversation as resolved.
Show resolved Hide resolved

It "kotlinc" {
"kotlinc -version" | Should -ReturnZeroExitCode
}

It "kotlinc-js" {
"kotlinc-js -version" | Should -ReturnZeroExitCode
}

It "kotlinc-jvm" {
"kotlinc-jvm -version" | Should -ReturnZeroExitCode
}

It "kotlin-dce-js" {
"kotlin-dce-js -version" | Should -ReturnZeroExitCode
}
mikhailshaganov marked this conversation as resolved.
Show resolved Hide resolved
}
3 changes: 2 additions & 1 deletion images/macos/toolsets/toolset-10.14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@
"swiftformat",
"swig",
"xctool",
"zstd"
"zstd",
"kotlin"
mikhailshaganov marked this conversation as resolved.
Show resolved Hide resolved
],
"cask_packages": [
"julia",
Expand Down
3 changes: 2 additions & 1 deletion images/macos/toolsets/toolset-10.15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,8 @@
"swiftformat",
"swig",
"xctool",
"zstd"
"zstd",
"kotlin"
],
"cask_packages": [
"julia",
Expand Down
3 changes: 2 additions & 1 deletion images/macos/toolsets/toolset-11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@
"subversion",
"swiftformat",
"swig",
"zstd"
"zstd",
"kotlin"
],
"cask_packages": [
"julia"
Expand Down