From 0dfb1b07ddda289fb7cce7f9d9f8b7ff3b38a2a2 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 1 Oct 2020 17:53:12 +0300 Subject: [PATCH 01/13] Enable Java tests since Java switching was fixed in MacOS 11.0 beta 9 --- images/macos/software-report/SoftwareReport.Generator.ps1 | 6 ++---- images/macos/tests/Java.Tests.ps1 | 2 +- images/macos/tests/Python.Tests.ps1 | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 87c94459..b403cd78 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -80,6 +80,7 @@ $homebrewVersion = Run-Command "brew --version" | Select-Object -First 1 $npmVersion = Run-Command "npm --version" $yarnVersion = Run-Command "yarn --version" $nugetVersion = Run-Command "nuget help" | Select-Object -First 1 | Take-Part -Part 2 +$pipVersion = Get-PipVersion -Version 2 $pip3Version = Get-PipVersion -Version 3 $condaVersion = Invoke-Expression "conda --version" $rubyGemsVersion = Run-Command "gem --version" @@ -90,12 +91,9 @@ if ($os.IsHigherThanMojave) { $vcpkgVersion = Get-VcpkgVersion $markdown += New-MDList -Lines $vcpkgVersion -Style Unordered -NoNewLine } -if ($os.IsLessThanBigSur) { - $pipVersion = Get-PipVersion -Version 2 - $markdown += New-MDList -Style Unordered -Lines @("Pip ${pipVersion}") -NoNewLine -} $markdown += New-MDList -Style Unordered -Lines @( + "Pip ${pipVersion}", "Pip ${pip3Version}", $bundlerVersion, "Carthage ${carthageVersion}", diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index 9171eb5b..450c23ec 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -11,7 +11,7 @@ function Get-NativeVersionFormat { return $Version } -Describe "Java" -Skip:($os.IsBigSur) { +Describe "Java" { BeforeAll { function Validate-JavaVersion { param($JavaCommand, $ExpectedVersion) diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1 index 76cd8941..76e5b497 100644 --- a/images/macos/tests/Python.Tests.ps1 +++ b/images/macos/tests/Python.Tests.ps1 @@ -12,7 +12,7 @@ Describe "Python" { (Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*" } - It "Python 2 is installed under /usr/local/bin" -Skip:($os.IsBigSur) { + It "Python 2 is installed under /usr/local/bin" { Get-WhichTool "python" | Should -BeLike "/usr/local/bin*" } @@ -24,7 +24,7 @@ Describe "Python" { Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*" } - It "Pip 2 is available" -Skip:($os.IsBigSur) { + It "Pip 2 is available" { "pip --version" | Should -ReturnZeroExitCode } From 5ec18c4b3d47230b0bca0da4b615f348a171e55a Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 2 Nov 2020 15:47:58 +0300 Subject: [PATCH 02/13] Update Java.Tests.ps1 --- images/macos/tests/Java.Tests.ps1 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index 450c23ec..9e21a5e4 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -38,17 +38,15 @@ Describe "Java" { } It "Version is valid" -TestCases $_ { - $javaRootPath = (Get-CommandResult "/usr/libexec/java_home -v${Version}").Output + $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk//Contents/Home" $javaBinPath = Join-Path $javaRootPath "/bin/java" Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version } It "" -TestCases $_ { $envVariablePath = Get-EnvironmentVariable $EnvVariable - $commandResult = Get-CommandResult "/usr/libexec/java_home -v${Version}" - $commandResult.ExitCode | Should -Be 0 - $commandResult.Output | Should -Not -BeNullOrEmpty - $commandResult.Output | Should -Be $envVariablePath + $javaBinPath = Join-Path $envVariablePath "/bin/java" + Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version } if ($_.Title -eq "Default") { From 9fe3134cd6346cd8aba2d4f73c181f13c9af4585 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Tue, 3 Nov 2020 15:55:19 +0300 Subject: [PATCH 03/13] remove quotes on post-deployment step --- images/linux/scripts/installers/post-deployment.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index d427a172..9b3e2fe0 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -17,13 +17,11 @@ rm -rf $HELPER_SCRIPT_FOLDER rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER -# Check PATH -if [[ $PATH == \"*\" ]] -then - echo "ERROR: PATH contains quotes" - echo "PATH = $PATH" - exit 1 -fi +# Remove quotes from PATH +PATH=${PATH#"\""} +PATH=${PATH%"\""} +echo "PATH=$PATH" | sudo tee -a /etc/environment +echo "Updated PATH: $PATH # Clean yarn and npm cache yarn cache clean From 09533dd5e91bce212f0b176aaa9857edfbaf1285 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Tue, 3 Nov 2020 15:56:49 +0300 Subject: [PATCH 04/13] fixed comment --- images/linux/scripts/installers/post-deployment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 9b3e2fe0..36a914c6 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -17,7 +17,7 @@ rm -rf $HELPER_SCRIPT_FOLDER rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER -# Remove quotes from PATH +# Remove quotes around PATH PATH=${PATH#"\""} PATH=${PATH%"\""} echo "PATH=$PATH" | sudo tee -a /etc/environment From 43e905b4bd90fa014a531a7cfce12b7d781cce4b Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 3 Nov 2020 16:58:07 +0300 Subject: [PATCH 05/13] Update Java.Tests.ps1 --- images/macos/tests/Java.Tests.ps1 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index 9e21a5e4..3ece545f 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -1,8 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -#Java tests are disabled because Java is not working properly on macOS 11.0 yet. -$os = Get-OSVersion function Get-NativeVersionFormat { param($Version) if ($Version -in "7", "8") { @@ -37,10 +35,13 @@ Describe "Java" { "/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode } - It "Version is valid" -TestCases $_ { - $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk//Contents/Home" - $javaBinPath = Join-Path $javaRootPath "/bin/java" - Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version + if ($_.Title -ne "Default") { + It "Version is valid" -TestCases $_ { + $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk/Contents/Home" + if ($Title -eq "7") { $javaRootPath = "/Library/Java/JavaVirtualMachines/zulu-7.jdk/Contents/Home" } + $javaBinPath = Join-Path $javaRootPath "/bin/java" + Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version + } } It "" -TestCases $_ { From 9d8d110fcf7e00fb55c89ba3b48c393af73d5c2d Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Wed, 4 Nov 2020 00:42:36 +0300 Subject: [PATCH 06/13] typo --- images/linux/scripts/installers/post-deployment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 36a914c6..2c7e6514 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -21,7 +21,7 @@ chmod 755 $IMAGE_FOLDER PATH=${PATH#"\""} PATH=${PATH%"\""} echo "PATH=$PATH" | sudo tee -a /etc/environment -echo "Updated PATH: $PATH +echo "Updated PATH: $PATH" # Clean yarn and npm cache yarn cache clean From 98731b3621b18f424be83be0e03eca9baf63b636 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Thu, 5 Nov 2020 10:36:01 +0300 Subject: [PATCH 07/13] get PATH from /etc/environment --- images/linux/scripts/installers/post-deployment.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 2c7e6514..403a1097 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -18,10 +18,11 @@ rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER # Remove quotes around PATH -PATH=${PATH#"\""} -PATH=${PATH%"\""} -echo "PATH=$PATH" | sudo tee -a /etc/environment -echo "Updated PATH: $PATH" +ENVPATH=$(cat /etc/environment | sed -z 's/^.*PATH=*//') +ENVPATH=${ENVPATH#"\""} +ENVPATH=${ENVPATH%"\""} +echo "PATH=$ENVPATH" | sudo tee -a /etc/environment +echo "Updated /etc/environment: $(cat /etc/environment)" # Clean yarn and npm cache yarn cache clean From 31b11e1576fe59335ba4845df91aa8515308b427 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Thu, 5 Nov 2020 15:38:26 +0300 Subject: [PATCH 08/13] select last entry of PATH, respect eol --- images/linux/scripts/installers/post-deployment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 403a1097..4202469d 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -18,7 +18,7 @@ rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER # Remove quotes around PATH -ENVPATH=$(cat /etc/environment | sed -z 's/^.*PATH=*//') +ENVPATH=$(grep 'PATH=' /etc/environment | tail -1 | sed -z 's/^.*PATH=*//') ENVPATH=${ENVPATH#"\""} ENVPATH=${ENVPATH%"\""} echo "PATH=$ENVPATH" | sudo tee -a /etc/environment From 0269bec6f466b9ff76a8b2e89e546640b0fced52 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Thu, 5 Nov 2020 22:08:19 +0300 Subject: [PATCH 09/13] grep first entry of PATH --- images/linux/scripts/installers/post-deployment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 4202469d..c14c00d7 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -18,7 +18,7 @@ rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER # Remove quotes around PATH -ENVPATH=$(grep 'PATH=' /etc/environment | tail -1 | sed -z 's/^.*PATH=*//') +ENVPATH=$(grep 'PATH=' /etc/environment | head -n 1 | sed -z 's/^PATH=*//') ENVPATH=${ENVPATH#"\""} ENVPATH=${ENVPATH%"\""} echo "PATH=$ENVPATH" | sudo tee -a /etc/environment From 45b33107cde77c43cfe3f8dc69aa1658d6c73a35 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 6 Nov 2020 00:33:39 +0300 Subject: [PATCH 10/13] Fix brew repository permissions to make it clean --- images/linux/scripts/installers/post-deployment.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index c14c00d7..15f3ebd8 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -24,6 +24,10 @@ ENVPATH=${ENVPATH%"\""} echo "PATH=$ENVPATH" | sudo tee -a /etc/environment echo "Updated /etc/environment: $(cat /etc/environment)" +# Fix brew repository permissions to make it clean +cd $(brew --prefix)/Homebrew +git reset --hard + # Clean yarn and npm cache yarn cache clean npm cache clean --force \ No newline at end of file From 981df9e44fdb7e897bcf2f25696625f0a468c246 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 6 Nov 2020 00:56:14 +0300 Subject: [PATCH 11/13] revert brew fix --- images/linux/scripts/installers/post-deployment.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 15f3ebd8..c14c00d7 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -24,10 +24,6 @@ ENVPATH=${ENVPATH%"\""} echo "PATH=$ENVPATH" | sudo tee -a /etc/environment echo "Updated /etc/environment: $(cat /etc/environment)" -# Fix brew repository permissions to make it clean -cd $(brew --prefix)/Homebrew -git reset --hard - # Clean yarn and npm cache yarn cache clean npm cache clean --force \ No newline at end of file From fa9109cc62be11105688bc7aa2305864a9dc762c Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Fri, 6 Nov 2020 22:13:28 +0300 Subject: [PATCH 12/13] [MacOS] Exclude release candidates from XCODE_DEVELOPER_DIR variables (#1998) * exclude release candidates from XCODE_DEVELOPER_DIR * Update Xcode.Tests.ps1 --- images/macos/provision/utils/xcode-utils.sh | 2 +- images/macos/tests/Xcode.Tests.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/utils/xcode-utils.sh b/images/macos/provision/utils/xcode-utils.sh index cfe93439..a5874c6f 100644 --- a/images/macos/provision/utils/xcode-utils.sh +++ b/images/macos/provision/utils/xcode-utils.sh @@ -55,7 +55,7 @@ runFirstLaunch() { } setXcodeDeveloperDirVariables() { - stable_xcode_versions=$(get_xcode_list_from_toolset | tr " " "\n" | grep -v "beta") + stable_xcode_versions=$(get_xcode_list_from_toolset | tr " " "\n" | grep -v "beta" | grep -v "Release_Candidate") major_versions=($(echo ${stable_xcode_versions[@]} | tr " " "\n" | cut -d '.' -f 1 | uniq)) for MAJOR_VERSION in "${major_versions[@]}" do diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index 250c8d8a..b00ab298 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -56,7 +56,7 @@ Describe "Xcode" { } Context "XCODE_DEVELOPER_DIR" { - $stableXcodeVersions = $XCODE_VERSIONS | ForEach-Object { $_.Split("_")[0] } | Where-Object { Test-XcodeStableRelease -Version $_ } + $stableXcodeVersions = $XCODE_VERSIONS | Where-Object { $_ -notlike "*Release*Candidate*" } | ForEach-Object { $_.Split("_")[0] } | Where-Object { Test-XcodeStableRelease -Version $_ } $majorXcodeVersions = $stableXcodeVersions | ForEach-Object { $_.Split(".")[0] } | Select-Object -Unique $testCases = $majorXcodeVersions | ForEach-Object { $majorXcodeVersion = $_ @@ -84,7 +84,7 @@ Describe "Xcode" { } Describe "Xcode simulators" { - $XCODE_VERSIONS | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object { + $XCODE_VERSIONS | Where-Object { $_ -notlike "*Release*Candidate*" } | ForEach-Object { $_.Split("_")[0] } | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object { Switch-Xcode -Version $_ Context "$_" { From 7c13be802f863ffc17952c5eceacc6200eacf172 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2020 12:59:02 +0000 Subject: [PATCH 13/13] Updating readme file for macOS-11.0 version 20201107.1 (#2016) Co-authored-by: Image generation service account --- images/macos/macos-11.0-Readme.md | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index e36ef538..b3d72603 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -2,14 +2,14 @@ |-| | [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) | | [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) | -| [.NET 5.0 will become a default .NET version on November, 10](https://github.com/actions/virtual-environments/issues/1891) | +| [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) | | [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) | | [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) | *** # macOS 11.0 info - System Version: macOS 11.0 (20A5395g) - Kernel Version: Darwin 20.1.0 -- Image Version: 20201102.1 +- Image Version: 20201107.1 ## Installed Software ### Language and Runtime @@ -18,8 +18,8 @@ - gcc-9 (Homebrew GCC 9.3.0) 9.3.0 - available by `gcc-9` alias - GNU Fortran (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0) 9.3.0 - available by `gfortran-9` alias -- Node.js v12.19.0 -- NVM 0.36.0 +- Node.js v14.15.0 +- NVM 0.37.0 - NVM - Cached node versions: v6.17.1 v8.17.0 v10.23.0 v12.19.0 v13.14.0 v14.15.0 - Python 2.7.17 - Python 3.8.6 @@ -42,7 +42,7 @@ - NuGet 5.6.0.6489 - Miniconda 4.8.3 - RubyGems 3.1.4 -- Composer 2.0.4 +- Composer 2.0.6 ### Project Management - Apache Maven 3.6.3 @@ -52,7 +52,7 @@ ### Utilities - Curl 7.73.0 - Git: 2.29.2 -- Git LFS: 2.12.0 +- Git LFS: 2.12.1 - GitHub CLI: 1.2.0 - Hub CLI: 2.14.2 - GNU Wget 1.20.3 @@ -64,7 +64,7 @@ - psql (PostgreSQL) 13.0 - PostgreSQL 13.0 - aria2 1.35.0 -- azcopy 10.6.1 +- azcopy 10.7.0 - zstd 1.4.5 - bazel 3.7.0 - bazelisk 1.7.4 @@ -75,12 +75,12 @@ - Newman 5.2.1 ### Tools -- Fastlane 2.165.0 +- Fastlane 2.166.0 - Cmake 3.18.4 - App Center CLI 2.7.3 -- Azure CLI 2.14.0 -- AWS CLI 2.0.61 -- AWS SAM CLI 1.7.0 +- Azure CLI 2.14.1 +- AWS CLI 2.0.62 +- AWS SAM CLI 1.8.0 - AWS Session Manager CLI 1.2.7.0 - Aliyun CLI 3.0.60 - GHCup v0.1.11 @@ -97,8 +97,8 @@ - SafariDriver 14.0.1 (16610.2.8.1.1) - Google Chrome 86.0.4240.183 - ChromeDriver 86.0.4240.22 -- Microsoft Edge 86.0.622.58 -- MSEdgeDriver 86.0.622.58 +- Microsoft Edge 86.0.622.63 +- MSEdgeDriver 86.0.622.63 - Mozilla Firefox 82.0.2 - geckodriver 0.27.0 @@ -125,7 +125,7 @@ - 14.15.0 #### Go -- 1.15.3 +- 1.15.4 ### Rust Tools - Rust 1.47.0 @@ -171,7 +171,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ---------------------------- | -| 12.2 (beta) | 12B5035g | /Applications/Xcode_12.2.app | +| 12.2 (beta) | 12B5044c | /Applications/Xcode_12.2.app | | 11.7 (default) | 11E801a | /Applications/Xcode_11.7.app | #### Xcode Support Tools @@ -214,7 +214,7 @@ | Android SDK Tools | 26.1.1 | | Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 30.0.4 | +| Android SDK Platform-Tools | 30.0.5 | | Android Support Repository | 47.0.0 | | Google Play services | 49 | | Google Repository | 58 |