From 0207af4ce96b948b25969f612c57220ce8f5a5e1 Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <mokhnach@gmail.com>
Date: Tue, 17 Sep 2024 11:11:54 +0200
Subject: [PATCH] feat: Bump android driver (#1028)

---
 .github/workflows/functional-test.yml | 17 ++++++-----------
 docs/hybrid-mode.md                   | 18 ++++++------------
 package.json                          |  2 +-
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml
index 3036f0fd4..52620aa63 100644
--- a/.github/workflows/functional-test.yml
+++ b/.github/workflows/functional-test.yml
@@ -16,24 +16,19 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - chromedriverVersion: "113.0.5672.63"
-          apiLevel: 32
+        - apiLevel: 32
           emuTag: google_apis
           arch: x86_64
-        - chromedriverVersion: "83.0.4103.39"
-          apiLevel: 30
+        - apiLevel: 30
           emuTag: google_apis
           arch: x86
-        - chromedriverVersion: "74.0.3729.6"
-          apiLevel: 29
+        - apiLevel: 29
           emuTag: default
           arch: x86
-        - chromedriverVersion: "2.28"
-          apiLevel: 25
+        - apiLevel: 25
           emuTag: default
           arch: x86
-        - chromedriverVersion: "2.20"
-          apiLevel: 23
+        - apiLevel: 23
           emuTag: default
           arch: x86
 
@@ -87,7 +82,7 @@ jobs:
         script: echo "Generated AVD snapshot for caching."
     - run: |
         npm install -g appium
-        npm install --chromedriver_version="${{ matrix.chromedriverVersion }}"
+        npm install
         npm install --no-save mjpeg-consumer
       name: Install dev dependencies
     - run: |
diff --git a/docs/hybrid-mode.md b/docs/hybrid-mode.md
index 0b3bda08d..1fbccfeea 100644
--- a/docs/hybrid-mode.md
+++ b/docs/hybrid-mode.md
@@ -40,7 +40,7 @@ know more about finding a matching Chromedriver executable.
 
 There are several ways to provide a customized Chromedriver to Espresso driver:
 
-#### When installing the driver
+#### When installing the driver (only in driver versions older than 3.4.0)
 
 Specify the Chromedriver version in the `CHROMEDRIVER_VERSION` environment variable:
 
@@ -103,23 +103,17 @@ There is a possibility to automatically download the necessary chromedriver(s) i
 
 ### Troubleshooting Chromedriver Download Issues
 
-When Espresso driver is installed it automatically downloads Chromedriver, so there is a possibility
-of network or other issues leading to an installation failure.
-
-By default, Chromedriver is retrieved from `https://chromedriver.storage.googleapis.com/`.
-To use a mirror of the above URL change the value of `CHROMEDRIVER_CDNURL` environemnt variable:
-
-```bash
-CHROMEDRIVER_CDNURL=https://npmmirror.com/mirrors/chromedriver appium driver install uiautomator2
-```
+Check the [Custom binaries url](https://github.com/appium/appium-chromedriver?tab=readme-ov-file#custom-binaries-url)
+section of appium-chromedriver README for more details on how to customize the download CDN.
 
 It may also be necessary to adjust network proxy and firewall settings for the above to work.
 
-In case you would like skip the download of Chromedriver entirely, do it by
+If you use Espresso driver below version 3.4.0, and you
+would like to skip the automated download of Chromedriver upon driver install, do it by
 defining the `APPIUM_SKIP_CHROMEDRIVER_INSTALL` environment variable:
 
 ```bash
-APPIUM_SKIP_CHROMEDRIVER_INSTALL=1 appium driver install uiautomator2
+APPIUM_SKIP_CHROMEDRIVER_INSTALL=1 appium driver install espresso
 ```
 
 ### W3C Support in Web Context
diff --git a/package.json b/package.json
index fcbbd2364..a66326aa2 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
   ],
   "dependencies": {
     "appium-adb": "^12.4.0",
-    "appium-android-driver": "^9.8.0",
+    "appium-android-driver": "^9.11.0",
     "asyncbox": "^3.0.0",
     "axios": "^1.7.2",
     "bluebird": "^3.5.0",