Merge branch 'master' into TECH-Java-8

KasperskyLab · Aug 16, 2024 · 75a507f · 75a507f
2 parents 0d9d694 + c9edb88
commit 75a507f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -6,16 +6,17 @@ check_android_30_task:
   skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')"
 
   container:
-    image: ghcr.io/cirruslabs/flutter:latest
+    image: ghcr.io/cirruslabs/android-sdk:34
     kvm: true
     cpu: 8
     memory: 24G
   start_adb_server_background_script:
     java -jar artifacts/adbserver-desktop.jar || true
   accept_licenses_script:
     echo yes | sdkmanager --licenses
-  install_emulator_script:
+  install_emulator_script: |
     # x86_64 somehow affect the "call" test
+    sdkmanager "emulator"
     sdkmanager --install "system-images;android-30;google_apis;x86"
   create_avd_script: |
     echo no | avdmanager create avd --force -n emulator -k "system-images;android-30;google_apis;x86"
@@ -74,15 +75,16 @@ check_android_33_task:
   skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')"
 
   container:
-    image: ghcr.io/cirruslabs/flutter:latest
+    image: ghcr.io/cirruslabs/android-sdk:34
     kvm: true
     cpu: 8
     memory: 24G
   start_adb_server_background_script:
     java -jar artifacts/adbserver-desktop.jar || true
   accept_licenses_script:
     echo yes | sdkmanager --licenses
-  install_emulator_script:
+  install_emulator_script: |
+    sdkmanager "emulator"
     sdkmanager --install "system-images;android-33;google_apis;x86_64"
   create_avd_script: |
     echo no | avdmanager create avd --force -n emulator -k "system-images;android-33;google_apis;x86_64"
@@ -138,7 +140,7 @@ check_android_21_task:
   skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')"
 
   container:
-    image: ghcr.io/cirruslabs/flutter:latest
+    image: ghcr.io/cirruslabs/android-sdk:34
     kvm: true
     cpu: 8
     memory: 24G

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ allure = "2.4.0"
 compose = "1.5.4"
 composeCompiler = "1.4.8"
 activityCompose = "1.4.0"
-androidXTest = "1.5.0"
+androidXTest = "1.6.1"
 testOrchestrator = "1.4.2"
 lifecycle = "2.6.2"
 thirdPartyReport = "0.19.1035"

diff --git a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/Permissions.kt b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/Permissions.kt
@@ -29,6 +29,8 @@ interface Permissions {
         ALLOW,
         ALLOW_ALWAYS,
         ALLOW_FOREGROUND,
+        ALLOW_ALL,
+        ALLOW_SELECTED,
         DENY
     }
 }
diff --git a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/PermissionsImpl.kt b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/PermissionsImpl.kt
@@ -34,6 +34,8 @@ class PermissionsImpl(
         Permissions.Button.ALLOW to getResIdWithPackageName("permission_allow_button"),
         Permissions.Button.ALLOW_ALWAYS to getResIdWithPackageName("permission_allow_always_button"),
         Permissions.Button.ALLOW_FOREGROUND to getResIdWithPackageName("permission_allow_foreground_only_button"),
+        Permissions.Button.ALLOW_ALL to getResIdWithPackageName("permission_allow_all_button"),
+        Permissions.Button.ALLOW_SELECTED to getResIdWithPackageName("permission_allow_selected_button"),
         Permissions.Button.DENY to getResIdWithPackageName("permission_deny_button")
     )