appium-espresso-driver 9.0.6 → 9.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
1
+ ## [9.1.0](https://github.com/appium/appium-espresso-driver/compare/v9.0.7...v9.1.0) (2026-08-21)
2
+
3
+ ### Features
4
+
5
+ * add missing support for gpsEnabled capability ([#1212](https://github.com/appium/appium-espresso-driver/issues/1212)) ([c4747ab](https://github.com/appium/appium-espresso-driver/commit/c4747ab56b87e4d4cef5019df8e020a729b8bb29))
6
+
7
+ ## [9.0.7](https://github.com/appium/appium-espresso-driver/compare/v9.0.6...v9.0.7) (2026-08-12)
8
+
9
+ ### Miscellaneous Chores
10
+
11
+ * rename safe occurrences of JWProxy ([#1210](https://github.com/appium/appium-espresso-driver/issues/1210)) ([dafbe7f](https://github.com/appium/appium-espresso-driver/commit/dafbe7f7a2c44a1c3efbd7ebbb760d83d98d0faf))
12
+
1
13
  ## [9.0.6](https://github.com/appium/appium-espresso-driver/compare/v9.0.5...v9.0.6) (2026-07-29)
2
14
 
3
15
  ### Miscellaneous Chores
package/README.md CHANGED
@@ -150,7 +150,7 @@ appium:avdReadyTimeout | Maximum number of milliseconds to wait until Android Em
150
150
  appium:avdArgs | Either a string or an array of emulator [command line arguments](https://developer.android.com/studio/run/emulator-commandline).
151
151
  appium:avdEnv | Mapping of emulator [environment variables](https://developer.android.com/studio/command-line/variables).
152
152
  appium:networkSpeed | Sets the desired network speed limit for the emulator. It is only applied if the emulator is not running before the test starts. See emulator [command line arguments](https://developer.android.com/studio/run/emulator-commandline) description for more details.
153
- appium:gpsEnabled | Sets whether to enable (`true`) or disable (`false`) GPS service in the Emulator. Unset by default, which means to not change the current value
153
+ appium:gpsEnabled | Sets whether to enable (`true`) or disable (`false`) GPS service in the Emulator. Unset by default, which means to not change the current value. Available since driver version 9.1.0.
154
154
  appium:isHeadless | If set to `true` then emulator starts in headless mode (e.g. no UI is shown). It is only applied if the emulator is not running before the test starts. `false` by default.
155
155
  appium:injectedImageProperties | Allows adjusting of injected image properties, like size, position or rotation. The image itself is expected to be injected by [mobile: injectEmulatorCameraImage](#mobile-injectemulatorcameraimage) extension. It is also mandatory to provide this capability if you are going to use the injection feature on a newly created/resetted emulator as it __enforces emulator restart__, so it could properly reload the modified image properties. The value itself is a map, where possible keys are `size`, `position` and `rotation`. All of them are optional. If any of values is not provided then the following defaults are used: `{size: {scaleX: 1, scaleY: 1}, position: {x: 0, y: 0, z: -1.5}, rotation: {x: 0, y: 0, z: 0}}`. The `size` value contains scale multipliers for X and Y axes. The `position` contains normalized coefficients for X/Y/Z axes, where `0` means it should be centered in the viewport. Values in the `rotation` are measured in degrees respectively for X, Y and Z axis. The capability is available since the driver version 2.43.0.
156
156
 
@@ -1,6 +1,6 @@
1
1
  import type { AppiumLogger, StringRecord, HTTPMethod, HTTPBody, ProxyResponse } from '@appium/types';
2
2
  import type { ADB } from 'appium-adb';
3
- import { JWProxy } from 'appium/driver.js';
3
+ import { WebDriverProxy } from 'appium/driver.js';
4
4
  import type { SubProcess } from 'teen_process';
5
5
  import { type ServerSigningConfig } from './builder.js';
6
6
  export interface EspressoRunnerOptions {
@@ -27,7 +27,7 @@ interface InstrumentationState {
27
27
  crashed: boolean;
28
28
  exited: boolean;
29
29
  }
30
- declare class EspressoProxy extends JWProxy {
30
+ declare class EspressoProxy extends WebDriverProxy {
31
31
  instrumentationState: InstrumentationState;
32
32
  proxyCommand(url: string, method: HTTPMethod, body?: HTTPBody): Promise<[ProxyResponse, HTTPBody]>;
33
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import path from 'node:path';
2
2
  import { fileURLToPath } from 'node:url';
3
- import { JWProxy, errors } from 'appium/driver.js';
3
+ import { WebDriverProxy, errors } from 'appium/driver.js';
4
4
  import { fs, node, util, timing } from 'appium/support.js';
5
5
  import { sleep, waitForCondition } from 'asyncbox';
6
6
  import axios from 'axios';
@@ -8,7 +8,7 @@ import * as semver from 'semver';
8
8
  import { getPackageInfoSync, getPackageInfo, isPlainObject } from '../../utils/index.js';
9
9
  import { ServerBuilder, buildServerSigningConfig } from './builder.js';
10
10
  import { ESPRESSO_SERVER_LAUNCH_TIMEOUT_MS, TARGET_PACKAGE_CONTAINER, TEST_APK_PKG } from './constants.js';
11
- class EspressoProxy extends JWProxy {
11
+ class EspressoProxy extends WebDriverProxy {
12
12
  instrumentationState;
13
13
  async proxyCommand(url, method, body = null) {
14
14
  const { crashed, exited } = this.instrumentationState;
@@ -1 +1 @@
1
- {"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/startup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAKpD;;GAEG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA4GtE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAoCrD;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpE;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAW7E"}
1
+ {"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/startup.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAKpD;;GAEG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAgHtE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAoCrD;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpE;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAW7E"}
@@ -1,3 +1,4 @@
1
+ import { util } from 'appium/support.js';
1
2
  import { qualifyActivityName, getPackageInfo } from '../../utils/index.js';
2
3
  import { DEVICE_PORT } from './constants.js';
3
4
  import { EspressoRunner } from './runner.js';
@@ -23,6 +24,10 @@ export async function startSession() {
23
24
  appInfo = this.opts;
24
25
  }
25
26
  // start an avd, set the language/locale, pick an emulator, etc...
27
+ if (util.hasValue(this.opts.gpsEnabled)) {
28
+ this.log.info(`Trying to ${this.opts.gpsEnabled ? 'enable' : 'disable'} gps location provider`);
29
+ await this.adb.toggleGPSLocationProvider(Boolean(this.opts.gpsEnabled));
30
+ }
26
31
  if (this.opts.hideKeyboard) {
27
32
  this._originalIme = await this.adb.defaultIME();
28
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"startup.js","sourceRoot":"","sources":["../../../../lib/commands/server/startup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"startup.js","sourceRoot":"","sources":["../../../../lib/commands/server/startup.ts"],"names":[],"mappings":"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"}
@@ -518,7 +518,7 @@ export declare const executeMethodMap: {
518
518
  readonly 'mobile: getAppStrings': {
519
519
  readonly command: "getStrings";
520
520
  readonly params: {
521
- readonly optional: readonly ["language"];
521
+ readonly optional: readonly ["language", "stringFile"];
522
522
  };
523
523
  };
524
524
  };
@@ -1,2 +1,2 @@
1
- #Wed Jul 29 16:47:50 UTC 2026
1
+ #Fri Aug 21 08:00:16 UTC 2026
2
2
  gradle.version=9.6.1
@@ -2,6 +2,6 @@ package io.appium.espressoserver.lib.helpers
2
2
 
3
3
  // This value is updated automatically by the NPM versioning script
4
4
  // It should be in sync with the NPM module version from package.json
5
- private const val VERSION = "9.0.6"
5
+ private const val VERSION = "9.1.0"
6
6
 
7
7
  fun getEspressoServerVersion() = VERSION
@@ -3,7 +3,7 @@ import {fileURLToPath} from 'node:url';
3
3
 
4
4
  import type {AppiumLogger, StringRecord, HTTPMethod, HTTPBody, ProxyResponse, ProxyOptions} from '@appium/types';
5
5
  import type {ADB} from 'appium-adb';
6
- import {JWProxy, errors} from 'appium/driver.js';
6
+ import {WebDriverProxy, errors} from 'appium/driver.js';
7
7
  import {fs, node, util, timing} from 'appium/support.js';
8
8
  import {sleep, waitForCondition} from 'asyncbox';
9
9
  import axios from 'axios';
@@ -55,7 +55,7 @@ interface SessionsResponse {
55
55
  value: SessionInfo[];
56
56
  }
57
57
 
58
- class EspressoProxy extends JWProxy {
58
+ class EspressoProxy extends WebDriverProxy {
59
59
  instrumentationState!: InstrumentationState;
60
60
 
61
61
  override async proxyCommand(
@@ -1,3 +1,5 @@
1
+ import {util} from 'appium/support.js';
2
+
1
3
  import type {EspressoDriver} from '../../driver.js';
2
4
  import {qualifyActivityName, getPackageInfo} from '../../utils/index.js';
3
5
  import {DEVICE_PORT} from './constants.js';
@@ -27,6 +29,10 @@ export async function startSession(this: EspressoDriver): Promise<void> {
27
29
  }
28
30
 
29
31
  // start an avd, set the language/locale, pick an emulator, etc...
32
+ if (util.hasValue(this.opts.gpsEnabled)) {
33
+ this.log.info(`Trying to ${this.opts.gpsEnabled ? 'enable' : 'disable'} gps location provider`);
34
+ await this.adb.toggleGPSLocationProvider(Boolean(this.opts.gpsEnabled));
35
+ }
30
36
  if (this.opts.hideKeyboard) {
31
37
  this._originalIme = await this.adb.defaultIME();
32
38
  }
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "appium-espresso-driver",
3
- "version": "9.0.6",
3
+ "version": "9.1.0",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "appium-espresso-driver",
9
- "version": "9.0.6",
9
+ "version": "9.1.0",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
12
  "appium-adb": "^16.0.0",
@@ -88,6 +88,18 @@
88
88
  "npm": ">=10"
89
89
  }
90
90
  },
91
+ "node_modules/@appium/base-driver/node_modules/axios": {
92
+ "version": "1.18.1",
93
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.18.1.tgz",
94
+ "integrity": "sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==",
95
+ "license": "MIT",
96
+ "dependencies": {
97
+ "follow-redirects": "^1.16.0",
98
+ "form-data": "^4.0.5",
99
+ "https-proxy-agent": "^5.0.1",
100
+ "proxy-from-env": "^2.1.0"
101
+ }
102
+ },
91
103
  "node_modules/@appium/logger": {
92
104
  "version": "2.0.10",
93
105
  "resolved": "https://registry.npmjs.org/@appium/logger/-/logger-2.0.10.tgz",
@@ -166,6 +178,18 @@
166
178
  "npm": ">=10"
167
179
  }
168
180
  },
181
+ "node_modules/@appium/support/node_modules/axios": {
182
+ "version": "1.18.1",
183
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.18.1.tgz",
184
+ "integrity": "sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==",
185
+ "license": "MIT",
186
+ "dependencies": {
187
+ "follow-redirects": "^1.16.0",
188
+ "form-data": "^4.0.5",
189
+ "https-proxy-agent": "^5.0.1",
190
+ "proxy-from-env": "^2.1.0"
191
+ }
192
+ },
169
193
  "node_modules/@appium/support/node_modules/teen_process": {
170
194
  "version": "4.1.9",
171
195
  "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-4.1.9.tgz",
@@ -251,9 +275,9 @@
251
275
  }
252
276
  },
253
277
  "node_modules/@xmldom/xmldom": {
254
- "version": "0.9.10",
255
- "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.10.tgz",
256
- "integrity": "sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==",
278
+ "version": "0.9.11",
279
+ "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.11.tgz",
280
+ "integrity": "sha512-tW8bcK3hsG0/uqSnNz6TK4BkcuZSezoU7DlnYssILmZDktPnSHHuDJJFM0AJv+13gz2r0iGdrj6qqKeUnxXEDg==",
257
281
  "license": "MIT",
258
282
  "engines": {
259
283
  "node": ">=14.6"
@@ -297,9 +321,9 @@
297
321
  }
298
322
  },
299
323
  "node_modules/ansi-regex": {
300
- "version": "6.2.2",
301
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
302
- "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
324
+ "version": "6.3.0",
325
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz",
326
+ "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==",
303
327
  "extraneous": true,
304
328
  "license": "MIT",
305
329
  "engines": {
@@ -326,9 +350,9 @@
326
350
  }
327
351
  },
328
352
  "node_modules/appium-adb": {
329
- "version": "16.0.2",
330
- "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-16.0.2.tgz",
331
- "integrity": "sha512-ygyjjdRbHiubZkVpNdMr+FZh11D5F3Mo7CvsabWnQByQA7ZbtiYELAXL9R9qYDr596mKU83vFWJXtxf0NFmYNw==",
353
+ "version": "16.0.3",
354
+ "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-16.0.3.tgz",
355
+ "integrity": "sha512-pUpD2IZR5HUmAIPxeBMA1issB2BroLk6VauzeV630QZmAYIlCowa+eVtHp47vDOM0DGLkFNWNYb5SX1EZ5T/8w==",
332
356
  "license": "Apache-2.0",
333
357
  "dependencies": {
334
358
  "@appium/support": "^7.2.2",
@@ -345,9 +369,9 @@
345
369
  }
346
370
  },
347
371
  "node_modules/appium-android-driver": {
348
- "version": "14.0.4",
349
- "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-14.0.4.tgz",
350
- "integrity": "sha512-BuxG2a1pTO92k05EZH+0bcifjAxYZ71mUT3exPOK4vtlDtPgk48Ciij5jtkP5wjG0bDFTDqebAnLsG1y34x1yg==",
372
+ "version": "14.0.6",
373
+ "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-14.0.6.tgz",
374
+ "integrity": "sha512-cG+R174hD0VdMk9+XiiHEHjixtkDSTGf3SD+JD4faltuH8D4TU7K86ZA/Jhmsvb5xchLR8OMDHFmti+ancztpw==",
351
375
  "license": "Apache-2.0",
352
376
  "dependencies": {
353
377
  "@appium/support": "^7.2.5",
@@ -372,9 +396,9 @@
372
396
  }
373
397
  },
374
398
  "node_modules/appium-chromedriver": {
375
- "version": "9.0.3",
376
- "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-9.0.3.tgz",
377
- "integrity": "sha512-0oY/UTwveExqa6UhRNU9x/1ljOFKyOgm5a311bCx8drkn/6ouxeky48BHx7pJulQdkR2LaJwOJV5O1qxoniBLg==",
399
+ "version": "9.0.9",
400
+ "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-9.0.9.tgz",
401
+ "integrity": "sha512-MahDwO0uAlVdVCoAmauShcp8LOqagRluKrxfv3jnz9T7oFfALDdnJtD096VJFK+0CYzjKj0e6CsMVn5wQTFCHA==",
378
402
  "license": "Apache-2.0",
379
403
  "dependencies": {
380
404
  "@appium/base-driver": "^10.0.0-rc.2",
@@ -426,9 +450,9 @@
426
450
  "license": "MIT"
427
451
  },
428
452
  "node_modules/asyncbox": {
429
- "version": "6.4.1",
430
- "resolved": "https://registry.npmjs.org/asyncbox/-/asyncbox-6.4.1.tgz",
431
- "integrity": "sha512-VsL3X0NczAVgqQAUkuwOdJ/yHay0GQFM6cuqgamWBcGgk70HVJPOnyYistHscN07NeULSHkXx62nb7vWoQ1C7A==",
453
+ "version": "6.4.2",
454
+ "resolved": "https://registry.npmjs.org/asyncbox/-/asyncbox-6.4.2.tgz",
455
+ "integrity": "sha512-CXEnvX5i4UtAdu3Egtqn5At9C1O3bIqtS3EAQGz8bA5H11cvu9eO17IxOWiM8Q8DUFk9sD251s9vsAXFKXXFgg==",
432
456
  "license": "Apache-2.0",
433
457
  "dependencies": {
434
458
  "p-limit": "^7.2.0"
@@ -445,13 +469,13 @@
445
469
  "license": "MIT"
446
470
  },
447
471
  "node_modules/axios": {
448
- "version": "1.18.1",
449
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.18.1.tgz",
450
- "integrity": "sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==",
472
+ "version": "1.19.0",
473
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.19.0.tgz",
474
+ "integrity": "sha512-ht/iuYZXEjFxLH/Hkezgd7m6JKlHHXEUSneaDz8uZe1Gj5QZtCnpyDsckvAiEnT89OEbCLmnte4R4sn7P0EKFw==",
451
475
  "license": "MIT",
452
476
  "dependencies": {
453
477
  "follow-redirects": "^1.16.0",
454
- "form-data": "^4.0.5",
478
+ "form-data": "^4.0.6",
455
479
  "https-proxy-agent": "^5.0.1",
456
480
  "proxy-from-env": "^2.1.0"
457
481
  }
@@ -494,9 +518,9 @@
494
518
  }
495
519
  },
496
520
  "node_modules/bare-fs": {
497
- "version": "4.7.4",
498
- "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.7.4.tgz",
499
- "integrity": "sha512-y1kC+ffIx/tPLdTE693uNjHfzTfr+ravR5tvWlMXe25nELbkqV400S71qHDwbkAQ1FVEZobB1NFRzFbCCcyBCQ==",
521
+ "version": "4.8.0",
522
+ "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.8.0.tgz",
523
+ "integrity": "sha512-fM+MhCvdQhZ7NV6S95a07gPSqjIYKn6mFaXfx266wN3ajZGl/+1AzH+ubkXQ0fFZvOe2nk9VHkzdYkQE5zMV3Q==",
500
524
  "license": "Apache-2.0",
501
525
  "dependencies": {
502
526
  "bare-events": "^2.5.4",
@@ -506,7 +530,7 @@
506
530
  "fast-fifo": "^1.3.2"
507
531
  },
508
532
  "engines": {
509
- "bare": ">=1.16.0"
533
+ "bare": ">=1.28.0"
510
534
  },
511
535
  "peerDependencies": {
512
536
  "bare-buffer": "*"
@@ -551,9 +575,9 @@
551
575
  }
552
576
  },
553
577
  "node_modules/bare-url": {
554
- "version": "2.4.6",
555
- "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.4.6.tgz",
556
- "integrity": "sha512-iQxPClE07hETVpbRoX7JXX3v/ZQViCxe/SYCxylRLzdEx1xJAufPptfiOqR8tqiCtmbtMDANKWszzjLu1PMAZQ==",
578
+ "version": "2.5.2",
579
+ "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.5.2.tgz",
580
+ "integrity": "sha512-L13PCJzKG8RGvx8V1/DdMi12ERhC3tprr7/8a94BxpmnRsFqxh5XZNdhtMxu5HPkRshYOOWRGY8lDP7ZhpG9Cg==",
557
581
  "license": "Apache-2.0",
558
582
  "dependencies": {
559
583
  "bare-path": "^3.0.0"
@@ -652,9 +676,9 @@
652
676
  }
653
677
  },
654
678
  "node_modules/brace-expansion": {
655
- "version": "5.0.8",
656
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz",
657
- "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==",
679
+ "version": "5.0.9",
680
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
681
+ "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
658
682
  "license": "MIT",
659
683
  "dependencies": {
660
684
  "balanced-match": "^4.0.2"
@@ -860,9 +884,9 @@
860
884
  }
861
885
  },
862
886
  "node_modules/content-type": {
863
- "version": "2.0.0",
864
- "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz",
865
- "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==",
887
+ "version": "2.1.0",
888
+ "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.1.0.tgz",
889
+ "integrity": "sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==",
866
890
  "license": "MIT",
867
891
  "engines": {
868
892
  "node": ">=18"
@@ -922,9 +946,9 @@
922
946
  }
923
947
  },
924
948
  "node_modules/dayjs": {
925
- "version": "1.11.21",
926
- "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.21.tgz",
927
- "integrity": "sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==",
949
+ "version": "1.11.23",
950
+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.23.tgz",
951
+ "integrity": "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==",
928
952
  "license": "MIT"
929
953
  },
930
954
  "node_modules/debug": {
@@ -1622,9 +1646,9 @@
1622
1646
  }
1623
1647
  },
1624
1648
  "node_modules/io.appium.settings": {
1625
- "version": "8.0.5",
1626
- "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-8.0.5.tgz",
1627
- "integrity": "sha512-eZ5s4VQTvTiIoujwVb8Z7EqT/m2CQQ3LH2l+s0B7lHnH2SaRVC0/Rhvj5/oveyT6+UA8oM30TAbJMN/72OgOHA==",
1649
+ "version": "8.0.8",
1650
+ "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-8.0.8.tgz",
1651
+ "integrity": "sha512-FiMO8IvA1AkvbdenHyN57OPOByt9zZ5MY5iMRJHo09qrk2Njxg1rs4fC8ztyiCm1NtaNMDVKcF9u9Zm3JBkKyQ==",
1628
1652
  "license": "Apache-2.0",
1629
1653
  "dependencies": {
1630
1654
  "@appium/logger": "^2.0.0-rc.1",
@@ -1972,12 +1996,19 @@
1972
1996
  "license": "MIT"
1973
1997
  },
1974
1998
  "node_modules/negotiator": {
1975
- "version": "1.0.0",
1976
- "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
1977
- "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
1999
+ "version": "1.1.0",
2000
+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.1.0.tgz",
2001
+ "integrity": "sha512-NMPBRMJgiQHjbd8phG3Vebdx4kZ1H121rbl5IkMqeOsahptB9BKo/d7oJ3zTXqTgagn2bWlNSXkh0QUGM31RYg==",
1978
2002
  "license": "MIT",
2003
+ "dependencies": {
2004
+ "content-type": "^2.1.0"
2005
+ },
1979
2006
  "engines": {
1980
- "node": ">= 0.6"
2007
+ "node": ">=18"
2008
+ },
2009
+ "funding": {
2010
+ "type": "opencollective",
2011
+ "url": "https://opencollective.com/express"
1981
2012
  }
1982
2013
  },
1983
2014
  "node_modules/normalize-package-data": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-espresso-driver",
3
- "version": "9.0.6",
3
+ "version": "9.1.0",
4
4
  "description": "Espresso integration for Appium",
5
5
  "keywords": [
6
6
  "android",