Merge branch 'master' of https://github.com/nikita-bykov/virtual-environments into pipx

images/macos/tests/Android.Tests.ps1

@@ -1,10 +1,22 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
 Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1"
 
 $os = Get-OSVersion
 
 Describe "Android" {
     $androidNdkToolchains = @("mips64el-linux-android-4.9", "mipsel-linux-android-4.9")
+    $androidSdkManagerPackages = Get-AndroidPackages
+    [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version"
+    [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version"
+
+    $platforms = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;', '' |
+    Where-Object { [int]$_.Split("-")[1] -ge $platformMinVersion } | Sort-Object { [int]$_.Split("-")[1] } -Unique |
+    ForEach-Object { "platforms/${_}" })
+
+    $buildTools = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' |
+    Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object { [version]$_ } -Unique |
+    ForEach-Object { "build-tools/${_}" })
 
     $androidPackages = @(
         "tools",
@@ -12,8 +24,8 @@ Describe "Android" {
         "tools/proguard",
         "ndk-bundle",
         "cmake",
-        (Get-ToolsetValue "android.platform-list" | ForEach-Object { "platforms/${_}" }),
-        (Get-ToolsetValue "android.build-tools" | ForEach-Object { "build-tools/${_}" }),
+        $platforms,
+        $buildTools,
         (Get-ToolsetValue "android.extra-list" | ForEach-Object { "extras/${_}" }),
         (Get-ToolsetValue "android.addon-list" | ForEach-Object { "add-ons/${_}" })
     ) | ForEach-Object { $_ }
@@ -26,7 +38,7 @@ Describe "Android" {
                 [Parameter(Mandatory=$true)]
                 [string]$PackageName
             )
-            
+
             # Convert 'm2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1' ->
             #         'm2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1'
             $PackageName = $PackageName.Replace(";", "/")
@@ -62,14 +74,14 @@ Describe "Android" {
             $rawContent = Get-Content $ndkBundlePath -Raw
             $rawContent | Should -BeLikeExactly "*Revision = 21.*"
         }
-            
+
         It "Android NDK version r18b is installed" {
             $ndk18BundlePath = Join-Path $ANDROID_SDK_DIR "ndk" "18.1.5063045" "source.properties"
             $rawContent = Get-Content $ndk18BundlePath -Raw
             $rawContent | Should -BeLikeExactly "*Revision = 18.*"
         }
     }
-    
+
     It "HAXM is installed" {
         $haxmPath = Join-Path $ANDROID_SDK_DIR "extras" "intel" "Hardware_Accelerated_Execution_Manager" "silent_install.sh"
         "$haxmPath -v" | Should -ReturnZeroExitCode

images/macos/tests/Common.Tests.ps1

@@ -102,10 +102,6 @@ Describe "Common utilities" {
         "aliyun --version" | Should -ReturnZeroExitCode
     }
 
-    It "Mobile Center CLI" -Skip:($os.IsBigSur) {
-        "mobile-center --version" | Should -ReturnZeroExitCode
-    }
-
     Context "Nomad" -Skip:($os.IsBigSur) {
         It "Nomad CLI" {
             $result = Get-CommandResult "gem list"