appium-uiautomator2-driver 8.2.2 → 8.4.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.
Files changed (11) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/README.md +5 -0
  3. package/build/lib/driver.d.ts +1 -1
  4. package/build/lib/execute-method-map.d.ts +1 -1
  5. package/build/lib/uiautomator2-server/core.d.ts +2 -2
  6. package/build/lib/uiautomator2-server/core.d.ts.map +1 -1
  7. package/build/lib/uiautomator2-server/core.js +2 -2
  8. package/build/lib/uiautomator2-server/core.js.map +1 -1
  9. package/lib/uiautomator2-server/core.ts +2 -2
  10. package/npm-shrinkwrap.json +34 -34
  11. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,3 +1,19 @@
1
+ ## [8.4.0](https://github.com/appium/appium-uiautomator2-driver/compare/v8.3.0...v8.4.0) (2026-08-12)
2
+
3
+ ### Features
4
+
5
+ * bump minimum appium-uiautomator2-server version and document mapTestTagToResourceId setting ([#1035](https://github.com/appium/appium-uiautomator2-driver/issues/1035)) ([d5f4d77](https://github.com/appium/appium-uiautomator2-driver/commit/d5f4d773df653a627ed3dbc9dc68f61545442520))
6
+
7
+ ## [8.3.0](https://github.com/appium/appium-uiautomator2-driver/compare/v8.2.2...v8.3.0) (2026-08-12)
8
+
9
+ ### Features
10
+
11
+ * bump minimum appium-uiautomator2-server version and document collection attributes ([#1034](https://github.com/appium/appium-uiautomator2-driver/issues/1034)) ([ee6979a](https://github.com/appium/appium-uiautomator2-driver/commit/ee6979a840adbc3a287566a3c67550df4829a737))
12
+
13
+ ### Miscellaneous Chores
14
+
15
+ * rename safe occurrences of JWProxy ([#1032](https://github.com/appium/appium-uiautomator2-driver/issues/1032)) ([0ea46a3](https://github.com/appium/appium-uiautomator2-driver/commit/0ea46a3b4f06992ba2417c988be5d4be5a97ad0e))
16
+
1
17
  ## [8.2.2](https://github.com/appium/appium-uiautomator2-driver/compare/v8.2.1...v8.2.2) (2026-07-29)
2
18
 
3
19
  ### Miscellaneous Chores
package/README.md CHANGED
@@ -250,6 +250,10 @@ actions | The comma-separated id names of the available accessibility actions fo
250
250
  tooltip-text | The result of [getTooltipText](https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#getTooltipText()). Could be `null`, available for API 28+ | 'Paste'
251
251
  text-has-clickable-span | Indicates whether the `TextView` content contains `ClickableSpan` or `URLSpan` elements, `null` in all other cases. | 'true'
252
252
  window-id | The integer identifier of the [accessbility window](https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo) this element belongs to. In some rare cases, it may not be present if the window identifier cannot be determined. | 123
253
+ is-collection | Whether the element represents a collection container (e.g. a list or grid), based on [getCollectionInfo](https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#getCollectionInfo()). Only included in the page source if `true`, to keep its size down. Available since driver version 8.3.0 | 'true'
254
+ is-collection-item | Whether the element represents an item within a collection container, based on [getCollectionItemInfo](https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#getCollectionItemInfo()). Only included in the page source if `true`, to keep its size down. Available since driver version 8.3.0 | 'true'
255
+ collection-info | A JSON representation of the element's [CollectionInfo](https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionInfo), containing `rowCount`, `columnCount`, `isHierarchical` and `selectionMode`. Only retrievable via `getAttribute`; never included in the page source. `null` if the element is not a collection. Available since driver version 8.3.0 | `{"rowCount":5,"columnCount":1,"isHierarchical":false,"selectionMode":0}`
256
+ collection-item-info | A JSON representation of the element's [CollectionItemInfo](https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo), containing `rowIndex`, `columnIndex`, `rowSpan`, `columnSpan`, `isHeading`, `isSelected`, and (API 33+ only) `rowTitle`/`columnTitle`. Only retrievable via `getAttribute`; never included in the page source. `null` if the element is not a collection item. Available since driver version 8.3.0 | `{"rowIndex":2,"columnIndex":0,"rowSpan":1,"columnSpan":1,"isHeading":false,"isSelected":true,"rowTitle":null,"columnTitle":null}`
253
257
 
254
258
 
255
259
  ## Element Location
@@ -342,6 +346,7 @@ includeExtrasInPageSource | boolean | Whether to include `extras` element attrib
342
346
  includeA11yActionsInPageSource | boolean | Whether to include `actions` element attribute in the XML page source result. Its value consists of names of available accessibility actions from [getActionList](https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo#getActionList()), separated by a comma. The value could be huge if elements in the XML page source have a lot of actions and could affect the performance of XML page source generation.
343
347
  snapshotMaxDepth | int | The number of maximum depth for the source tree snapshot. The default value is `70`. This number should be in range [1, 500]. A part of the elements source tree might be lost if the value is too low. Also, StackOverflowError might be caused if the value is too high (Issues [12545](https://github.com/appium/appium/issues/12545), [12892](https://github.com/appium/appium/issues/12892)). The available driver version is `2.27.0` or higher.
344
348
  currentDisplayId | int | The id of the display that should be used when finding elements, taking screenshots, etc. It can be found in the output of `adb shell dumpsys display` (search for `mDisplayId`). The default value is [Display.DEFAULT_DISPLAY](https://developer.android.com/reference/android/view/Display#DEFAULT_DISPLAY). See the [Multi-Window Testing Guide](docs/android-multiwindow.md) for detailed information about windows, displays, and how this setting affects element location. Set this setting to `-1` in order to reset it.
349
+ mapTestTagToResourceId | boolean | Whether to map the [testTag](https://developer.android.com/reference/kotlin/androidx/compose/ui/platform/package-summary#(androidx.compose.ui.Modifier).testTag(kotlin.String)) semantics property of Jetpack Compose elements onto their `resource-id` attribute. This mirrors the behavior of Compose's own [testTagsAsResourceId](https://developer.android.com/reference/kotlin/androidx/compose/ui/semantics/package-summary#(androidx.compose.ui.semantics.SemanticsPropertyReceiver).testTagsAsResourceId()), which can only be toggled from within the app's own composable tree, by allowing it to be controlled externally instead. The mapping is consistently applied to `getAttribute`, page source/XPath generation, and id-based element lookups. Unlike `disableIdLocatorAutocompletion`, bare `testTag` values are matched as is, without automatically prepending the application package name. `false` by default. Available since driver version 8.4.0.
345
350
 
346
351
 
347
352
  ## Platform-Specific Extensions
package/build/lib/driver.d.ts CHANGED
@@ -968,7 +968,7 @@ declare class AndroidUiautomator2Driver extends AndroidDriver implements Externa
968
968
  readonly 'mobile: getAppStrings': {
969
969
  readonly command: "getStrings";
970
970
  readonly params: {
971
- readonly optional: readonly ["language"];
971
+ readonly optional: readonly ["language", "stringFile"];
972
972
  };
973
973
  };
974
974
  };
package/build/lib/execute-method-map.d.ts CHANGED
@@ -560,7 +560,7 @@ export declare const executeMethodMap: {
560
560
  readonly 'mobile: getAppStrings': {
561
561
  readonly command: "getStrings";
562
562
  readonly params: {
563
- readonly optional: readonly ["language"];
563
+ readonly optional: readonly ["language", "stringFile"];
564
564
  };
565
565
  };
566
566
  };
package/build/lib/uiautomator2-server/core.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import type { AppiumLogger, StringRecord, HTTPMethod, HTTPBody, ProxyResponse } from '@appium/types';
2
2
  import type { ADB, InstallState } from 'appium-adb';
3
- import { JWProxy } from 'appium/driver.js';
3
+ import { WebDriverProxy } from 'appium/driver.js';
4
4
  export declare const INSTRUMENTATION_TARGET = "io.appium.uiautomator2.server.test/androidx.test.runner.AndroidJUnitRunner";
5
5
  export interface PackageInfo {
6
6
  installState: InstallState;
@@ -16,7 +16,7 @@ export interface UiAutomator2ServerOptions {
16
16
  disableSuppressAccessibilityService?: boolean;
17
17
  basePath?: string;
18
18
  }
19
- declare class UIA2Proxy extends JWProxy {
19
+ declare class UIA2Proxy extends WebDriverProxy {
20
20
  didInstrumentationExit: boolean;
21
21
  proxyCommand(url: string, method: HTTPMethod, body?: HTTPBody): Promise<[ProxyResponse, HTTPBody]>;
22
22
  }
package/build/lib/uiautomator2-server/core.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../lib/uiautomator2-server/core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAe,MAAM,eAAe,CAAC;AACjH,OAAO,KAAK,EAAC,GAAG,EAAE,YAAY,EAAC,MAAM,YAAY,CAAC;AAMlD,OAAO,EAAC,OAAO,EAAS,MAAM,kBAAkB,CAAC;AAajD,eAAO,MAAM,sBAAsB,+EAAsE,CAAC;AAE1G,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,yBAAyB;IACxC,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mCAAmC,CAAC,EAAE,OAAO,CAAC;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAsBD,cAAM,SAAU,SAAQ,OAAO;IACtB,sBAAsB,EAAE,OAAO,CAAS;IAEhC,YAAY,CACzB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,UAAU,EAClB,IAAI,GAAE,QAAe,GACpB,OAAO,CAAC,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;CAUtC;AAED,qBAAa,kBAAkB;IAC7B,SAAgB,OAAO,EAAE,SAAS,CAAC;IACnC,SAAgB,WAAW,EAAE,OAAO,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC;IACpE,SAAgB,YAAY,EAAE,OAAO,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;IAEjE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IACrC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAO;IAC3B,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAW;IAClD,OAAO,CAAC,QAAQ,CAAC,mCAAmC,CAAC,CAAU;IAC/D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,sBAAsB,CAA2B;gBAE7C,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,yBAAyB;IA8B9D;;;;OAIG;IACG,gBAAgB,CAAC,cAAc,GAAE,MAAsC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgDvF,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA4E/C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;YA2BtB,oBAAoB;IAkBlC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,6BAA6B;IAYrC;;;;;;OAMG;IACH,OAAO,CAAC,2BAA2B;YAQrB,0BAA0B;YA8C1B,2BAA2B;YAwB3B,0BAA0B;YAW1B,0BAA0B;IA0CxC;;;;;OAKG;YACW,mBAAmB;CAsBlC"}
1
+ {"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../lib/uiautomator2-server/core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAe,MAAM,eAAe,CAAC;AACjH,OAAO,KAAK,EAAC,GAAG,EAAE,YAAY,EAAC,MAAM,YAAY,CAAC;AAMlD,OAAO,EAAC,cAAc,EAAS,MAAM,kBAAkB,CAAC;AAaxD,eAAO,MAAM,sBAAsB,+EAAsE,CAAC;AAE1G,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,yBAAyB;IACxC,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mCAAmC,CAAC,EAAE,OAAO,CAAC;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAsBD,cAAM,SAAU,SAAQ,cAAc;IAC7B,sBAAsB,EAAE,OAAO,CAAS;IAEhC,YAAY,CACzB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,UAAU,EAClB,IAAI,GAAE,QAAe,GACpB,OAAO,CAAC,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;CAUtC;AAED,qBAAa,kBAAkB;IAC7B,SAAgB,OAAO,EAAE,SAAS,CAAC;IACnC,SAAgB,WAAW,EAAE,OAAO,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC;IACpE,SAAgB,YAAY,EAAE,OAAO,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;IAEjE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IACrC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAO;IAC3B,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAW;IAClD,OAAO,CAAC,QAAQ,CAAC,mCAAmC,CAAC,CAAU;IAC/D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,sBAAsB,CAA2B;gBAE7C,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,yBAAyB;IA8B9D;;;;OAIG;IACG,gBAAgB,CAAC,cAAc,GAAE,MAAsC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgDvF,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA4E/C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;YA2BtB,oBAAoB;IAkBlC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,6BAA6B;IAYrC;;;;;;OAMG;IACH,OAAO,CAAC,2BAA2B;YAQrB,0BAA0B;YA8C1B,2BAA2B;YAwB3B,0BAA0B;YAW1B,0BAA0B;IA0CxC;;;;;OAKG;YACW,mBAAmB;CAsBlC"}
package/build/lib/uiautomator2-server/core.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { SERVER_APK_PATH as apkPath, TEST_APK_PATH as testApkPath, version as serverVersion, } from 'appium-uiautomator2-server';
2
- import { JWProxy, errors } from 'appium/driver.js';
2
+ import { WebDriverProxy, errors } from 'appium/driver.js';
3
3
  import { util, timing } from 'appium/support.js';
4
4
  import { sleep, waitForCondition } from 'asyncbox';
5
5
  import axios from 'axios';
@@ -16,7 +16,7 @@ const REQUIRED_OPTIONS = [
16
16
  'systemPort',
17
17
  'disableWindowAnimation',
18
18
  ];
19
- class UIA2Proxy extends JWProxy {
19
+ class UIA2Proxy extends WebDriverProxy {
20
20
  didInstrumentationExit = false;
21
21
  async proxyCommand(url, method, body = null) {
22
22
  if (this.didInstrumentationExit) {
package/build/lib/uiautomator2-server/core.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/uiautomator2-server/core.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"core.js","sourceRoot":"","sources":["../../../lib/uiautomator2-server/core.ts"],"names":[],"mappings":"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"}
package/lib/uiautomator2-server/core.ts CHANGED
@@ -5,7 +5,7 @@ import {
5
5
  TEST_APK_PATH as testApkPath,
6
6
  version as serverVersion,
7
7
  } from 'appium-uiautomator2-server';
8
- import {JWProxy, errors} from 'appium/driver.js';
8
+ import {WebDriverProxy, errors} from 'appium/driver.js';
9
9
  import {util, timing} from 'appium/support.js';
10
10
  import {sleep, waitForCondition} from 'asyncbox';
11
11
  import axios from 'axios';
@@ -56,7 +56,7 @@ const REQUIRED_OPTIONS: RequiredKeysOf<UiAutomator2ServerOptions>[] = [
56
56
  'disableWindowAnimation',
57
57
  ] as const;
58
58
 
59
- class UIA2Proxy extends JWProxy {
59
+ class UIA2Proxy extends WebDriverProxy {
60
60
  public didInstrumentationExit: boolean = false;
61
61
 
62
62
  override async proxyCommand(
package/npm-shrinkwrap.json CHANGED
@@ -1,18 +1,18 @@
1
1
  {
2
2
  "name": "appium-uiautomator2-driver",
3
- "version": "8.2.2",
3
+ "version": "8.4.0",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "appium-uiautomator2-driver",
9
- "version": "8.2.2",
9
+ "version": "8.4.0",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
12
  "@appium/css-locator-to-native": "^1.0.1",
13
13
  "appium-adb": "^16.0.0",
14
14
  "appium-android-driver": "^14.0.2",
15
- "appium-uiautomator2-server": "^10.3.3",
15
+ "appium-uiautomator2-server": "^10.6.0",
16
16
  "asyncbox": "^6.0.1",
17
17
  "axios": "^1.16.0",
18
18
  "io.appium.settings": "^8.0.1",
@@ -379,9 +379,9 @@
379
379
  }
380
380
  },
381
381
  "node_modules/ansi-regex": {
382
- "version": "6.2.2",
383
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
384
- "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
382
+ "version": "6.3.0",
383
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz",
384
+ "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==",
385
385
  "dev": true,
386
386
  "license": "MIT",
387
387
  "engines": {
@@ -408,9 +408,9 @@
408
408
  }
409
409
  },
410
410
  "node_modules/appium-adb": {
411
- "version": "16.0.2",
412
- "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-16.0.2.tgz",
413
- "integrity": "sha512-ygyjjdRbHiubZkVpNdMr+FZh11D5F3Mo7CvsabWnQByQA7ZbtiYELAXL9R9qYDr596mKU83vFWJXtxf0NFmYNw==",
411
+ "version": "16.0.3",
412
+ "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-16.0.3.tgz",
413
+ "integrity": "sha512-pUpD2IZR5HUmAIPxeBMA1issB2BroLk6VauzeV630QZmAYIlCowa+eVtHp47vDOM0DGLkFNWNYb5SX1EZ5T/8w==",
414
414
  "license": "Apache-2.0",
415
415
  "dependencies": {
416
416
  "@appium/support": "^7.2.2",
@@ -427,9 +427,9 @@
427
427
  }
428
428
  },
429
429
  "node_modules/appium-android-driver": {
430
- "version": "14.0.4",
431
- "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-14.0.4.tgz",
432
- "integrity": "sha512-BuxG2a1pTO92k05EZH+0bcifjAxYZ71mUT3exPOK4vtlDtPgk48Ciij5jtkP5wjG0bDFTDqebAnLsG1y34x1yg==",
430
+ "version": "14.0.6",
431
+ "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-14.0.6.tgz",
432
+ "integrity": "sha512-cG+R174hD0VdMk9+XiiHEHjixtkDSTGf3SD+JD4faltuH8D4TU7K86ZA/Jhmsvb5xchLR8OMDHFmti+ancztpw==",
433
433
  "license": "Apache-2.0",
434
434
  "dependencies": {
435
435
  "@appium/support": "^7.2.5",
@@ -454,9 +454,9 @@
454
454
  }
455
455
  },
456
456
  "node_modules/appium-chromedriver": {
457
- "version": "9.0.3",
458
- "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-9.0.3.tgz",
459
- "integrity": "sha512-0oY/UTwveExqa6UhRNU9x/1ljOFKyOgm5a311bCx8drkn/6ouxeky48BHx7pJulQdkR2LaJwOJV5O1qxoniBLg==",
457
+ "version": "9.0.8",
458
+ "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-9.0.8.tgz",
459
+ "integrity": "sha512-7S0Xy+plSNHkq8DWF4/nVYWsfN9IhmV7cCYhOBrPmZSIPtXG/UjhqxVIVFFZjgbtGbCUNULbaUW4GTfVvIAtqw==",
460
460
  "license": "Apache-2.0",
461
461
  "dependencies": {
462
462
  "@appium/base-driver": "^10.0.0-rc.2",
@@ -476,9 +476,9 @@
476
476
  }
477
477
  },
478
478
  "node_modules/appium-uiautomator2-server": {
479
- "version": "10.3.5",
480
- "resolved": "https://registry.npmjs.org/appium-uiautomator2-server/-/appium-uiautomator2-server-10.3.5.tgz",
481
- "integrity": "sha512-P3q+/EHN2ir1XqCoR9u059Qn6Rp30w8qCdLRCzcIwb39GJo4DkV+4Gry+Za6BQtssto7jEbXq6KGc7LJDiCBvw==",
479
+ "version": "10.6.0",
480
+ "resolved": "https://registry.npmjs.org/appium-uiautomator2-server/-/appium-uiautomator2-server-10.6.0.tgz",
481
+ "integrity": "sha512-SphqFl8OSJIDMSRHExdhMXi1s/4tyGIDRCsxAuVIZAyyMSqr0/BLcdx1ZxokkUuDO4/Od2zvl0jsUYPZ6niS3g==",
482
482
  "license": "Apache-2.0",
483
483
  "engines": {
484
484
  "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
@@ -518,9 +518,9 @@
518
518
  "license": "MIT"
519
519
  },
520
520
  "node_modules/asyncbox": {
521
- "version": "6.4.1",
522
- "resolved": "https://registry.npmjs.org/asyncbox/-/asyncbox-6.4.1.tgz",
523
- "integrity": "sha512-VsL3X0NczAVgqQAUkuwOdJ/yHay0GQFM6cuqgamWBcGgk70HVJPOnyYistHscN07NeULSHkXx62nb7vWoQ1C7A==",
521
+ "version": "6.4.2",
522
+ "resolved": "https://registry.npmjs.org/asyncbox/-/asyncbox-6.4.2.tgz",
523
+ "integrity": "sha512-CXEnvX5i4UtAdu3Egtqn5At9C1O3bIqtS3EAQGz8bA5H11cvu9eO17IxOWiM8Q8DUFk9sD251s9vsAXFKXXFgg==",
524
524
  "license": "Apache-2.0",
525
525
  "dependencies": {
526
526
  "p-limit": "^7.2.0"
@@ -586,9 +586,9 @@
586
586
  }
587
587
  },
588
588
  "node_modules/bare-fs": {
589
- "version": "4.7.4",
590
- "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.7.4.tgz",
591
- "integrity": "sha512-y1kC+ffIx/tPLdTE693uNjHfzTfr+ravR5tvWlMXe25nELbkqV400S71qHDwbkAQ1FVEZobB1NFRzFbCCcyBCQ==",
589
+ "version": "4.8.0",
590
+ "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.8.0.tgz",
591
+ "integrity": "sha512-fM+MhCvdQhZ7NV6S95a07gPSqjIYKn6mFaXfx266wN3ajZGl/+1AzH+ubkXQ0fFZvOe2nk9VHkzdYkQE5zMV3Q==",
592
592
  "license": "Apache-2.0",
593
593
  "dependencies": {
594
594
  "bare-events": "^2.5.4",
@@ -598,7 +598,7 @@
598
598
  "fast-fifo": "^1.3.2"
599
599
  },
600
600
  "engines": {
601
- "bare": ">=1.16.0"
601
+ "bare": ">=1.28.0"
602
602
  },
603
603
  "peerDependencies": {
604
604
  "bare-buffer": "*"
@@ -643,9 +643,9 @@
643
643
  }
644
644
  },
645
645
  "node_modules/bare-url": {
646
- "version": "2.4.6",
647
- "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.4.6.tgz",
648
- "integrity": "sha512-iQxPClE07hETVpbRoX7JXX3v/ZQViCxe/SYCxylRLzdEx1xJAufPptfiOqR8tqiCtmbtMDANKWszzjLu1PMAZQ==",
646
+ "version": "2.5.2",
647
+ "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.5.2.tgz",
648
+ "integrity": "sha512-L13PCJzKG8RGvx8V1/DdMi12ERhC3tprr7/8a94BxpmnRsFqxh5XZNdhtMxu5HPkRshYOOWRGY8lDP7ZhpG9Cg==",
649
649
  "license": "Apache-2.0",
650
650
  "dependencies": {
651
651
  "bare-path": "^3.0.0"
@@ -744,9 +744,9 @@
744
744
  }
745
745
  },
746
746
  "node_modules/brace-expansion": {
747
- "version": "5.0.8",
748
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz",
749
- "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==",
747
+ "version": "5.0.9",
748
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
749
+ "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
750
750
  "license": "MIT",
751
751
  "dependencies": {
752
752
  "balanced-match": "^4.0.2"
@@ -1731,9 +1731,9 @@
1731
1731
  }
1732
1732
  },
1733
1733
  "node_modules/io.appium.settings": {
1734
- "version": "8.0.5",
1735
- "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-8.0.5.tgz",
1736
- "integrity": "sha512-eZ5s4VQTvTiIoujwVb8Z7EqT/m2CQQ3LH2l+s0B7lHnH2SaRVC0/Rhvj5/oveyT6+UA8oM30TAbJMN/72OgOHA==",
1734
+ "version": "8.0.8",
1735
+ "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-8.0.8.tgz",
1736
+ "integrity": "sha512-FiMO8IvA1AkvbdenHyN57OPOByt9zZ5MY5iMRJHo09qrk2Njxg1rs4fC8ztyiCm1NtaNMDVKcF9u9Zm3JBkKyQ==",
1737
1737
  "license": "Apache-2.0",
1738
1738
  "dependencies": {
1739
1739
  "@appium/logger": "^2.0.0-rc.1",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-uiautomator2-driver",
3
- "version": "8.2.2",
3
+ "version": "8.4.0",
4
4
  "description": "UiAutomator2 integration for Appium",
5
5
  "keywords": [
6
6
  "android",
@@ -63,7 +63,7 @@
63
63
  "@appium/css-locator-to-native": "^1.0.1",
64
64
  "appium-adb": "^16.0.0",
65
65
  "appium-android-driver": "^14.0.2",
66
- "appium-uiautomator2-server": "^10.3.3",
66
+ "appium-uiautomator2-server": "^10.6.0",
67
67
  "asyncbox": "^6.0.1",
68
68
  "axios": "^1.16.0",
69
69
  "io.appium.settings": "^8.0.1",