appium-espresso-driver 8.5.1 → 8.5.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [8.5.2](https://github.com/appium/appium-espresso-driver/compare/v8.5.1...v8.5.2) (2026-05-23)
+
+### Bug Fixes
+
+* Kotlin dependencies resolution by dependabot ([#1165](https://github.com/appium/appium-espresso-driver/issues/1165)) ([b109b3d](https://github.com/appium/appium-espresso-driver/commit/b109b3d3bcf7b533adcb94331aeb4e4cd01d9621))
+
 ## [8.5.1](https://github.com/appium/appium-espresso-driver/compare/v8.5.0...v8.5.1) (2026-05-21)
 
 ### Miscellaneous Chores

package/build/lib/commands/app-install.d.ts

@@ -1,8 +1,12 @@
-import type { PostProcessOptions, PostProcessResult } from '@appium/types';
+import type { PostProcessOptions, PostProcessResult, CachedAppInfo } from '@appium/types';
 import type { EspressoDriver } from '../driver';
 export declare const APK_EXT = ".apk";
 export declare const AAB_EXT = ".aab";
 export declare const SUPPORTED_EXTENSIONS: string[];
+/** Cached app entry with integrity path (narrower than {@link CachedAppInfo}). */
+export type StrictCachedAppInfo = CachedAppInfo & {
+    fullPath: string;
+};
 /** Whether the session targets an app already installed on the device (no app path). */
 export declare function isAppOnDevice(driver: EspressoDriver): boolean;
 /**

package/build/lib/commands/app-install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-install.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-install.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAKzE,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAI9C,eAAO,MAAM,OAAO,SAAS,CAAC;AAC9B,eAAO,MAAM,OAAO,SAAS,CAAC;AAC9B,eAAO,MAAM,oBAAoB,UAAqB,CAAC;AAEvD,wFAAwF;AACxF,wBAAgB,aAAa,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAG7D;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBrF;AAED,mFAAmF;AACnF,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAiExC;AAED,wDAAwD;AACxD,wBAAsB,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDjE"}
+{"version":3,"file":"app-install.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-install.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAE,iBAAiB,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAKxF,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAI9C,eAAO,MAAM,OAAO,SAAS,CAAC;AAC9B,eAAO,MAAM,OAAO,SAAS,CAAC;AAC9B,eAAO,MAAM,oBAAoB,UAAqB,CAAC;AAEvD,kFAAkF;AAClF,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC;AAErE,wFAAwF;AACxF,wBAAgB,aAAa,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAG7D;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBrF;AAED,mFAAmF;AACnF,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAiExC;AAED,wDAAwD;AACxD,wBAAsB,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDjE"}

package/build/lib/commands/app-install.js

@@ -12,8 +12,8 @@ const appium_android_driver_1 = require("appium-android-driver");
 const support_1 = require("appium/support");
 const io_appium_settings_1 = require("io.appium.settings");
 const node_path_1 = __importDefault(require("node:path"));
-const app_1 = require("./app");
 const server_1 = require("./server");
+const utils_1 = require("../utils");
 exports.APK_EXT = '.apk';
 exports.AAB_EXT = '.aab';
 exports.SUPPORTED_EXTENSIONS = [exports.APK_EXT, exports.AAB_EXT];
@@ -69,7 +69,7 @@ async function onPostConfigureApp(opts) {
     const extractUniversalApk = async (shouldExtract, p) => shouldExtract ? p : await this.adb.extractUniversalApk(p);
     let pathInCache = null;
     let isResultAppPathAlreadyCached = false;
-    if ((0, app_1.isCachedAppInfo)(cachedAppInfo)) {
+    if (isCachedAppInfo(cachedAppInfo)) {
         const packageHash = await support_1.fs.hash(appPath);
         if (packageHash === cachedAppInfo.packageHash && (await support_1.fs.exists(cachedAppInfo.fullPath))) {
             this.log.info(`Using '${cachedAppInfo.fullPath}' which is cached from '${appPath}'`);
@@ -154,4 +154,10 @@ async function initAUT() {
         this.log.warn(`Cannot add server packages to the Doze whitelist. Original error: ` + (stderr || message));
     }
 }
+/** Type guard for cached app metadata shape. */
+function isCachedAppInfo(value) {
+    return ((0, utils_1.isPlainObject)(value) &&
+        typeof value.packageHash === 'string' &&
+        typeof value.fullPath === 'string');
+}
 //# sourceMappingURL=app-install.js.map

package/build/lib/commands/app-install.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-install.js","sourceRoot":"","sources":["../../../lib/commands/app-install.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app-install.js","sourceRoot":"","sources":["../../../lib/commands/app-install.ts"],"names":[],"mappings":";;;;;;AAiBA,sCAGC;AAUD,4BAuBC;AAGD,gDAoEC;AAGD,0BAoDC;AAlLD,iEAA4C;AAC5C,4CAAgD;AAChD,2DAAsD;AACtD,0DAA6B;AAE7B,qCAAsC;AACtC,oCAAuC;AAE1B,QAAA,OAAO,GAAG,MAAM,CAAC;AACjB,QAAA,OAAO,GAAG,MAAM,CAAC;AACjB,QAAA,oBAAoB,GAAG,CAAC,eAAO,EAAE,eAAO,CAAC,CAAC;AAKvD,wFAAwF;AACxF,SAAgB,aAAa,CAAC,MAAsB;IAClD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;IAC1C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;AAC1F,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,QAAQ,CAAuB,OAAe;IAClE,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;IACjE,MAAM,cAAc,GAClB,CAAC,iBAAiB,IAAI,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,CAAC;IAClF,MAAM,OAAO,GAAG,MAAM,iBAAO,CAAC,OAAO,EAAE,CAAC;IACxC,MAAM,aAAG,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,EAAC,cAAc,EAAC,CAAC,CAAC;IAE3D,MAAM,WAAW,GAAG,UAAU,4BAAoB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACrG,MAAM,iBAAiB,GAAG,CACxB,MAAM,YAAE,CAAC,IAAI,CAAC,WAAW,EAAE;QACzB,GAAG,EAAE,OAAO;KACb,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,mBAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;IACtE,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,yBAAyB,4BAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YAC1E,6EAA6E;YAC7E,sCAAsC,CACzC,CAAC;IACJ,CAAC;IACD,MAAM,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,eAAe,gCAAgC,OAAO,GAAG,CAAC,CAAC;IAC9E,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,mFAAmF;AAC5E,KAAK,UAAU,kBAAkB,CAEtC,IAAwB;IAExB,MAAM,EAAC,aAAa,EAAE,KAAK,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC;IAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAE;QAC/C,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,yEAAyE;gBACvE,kFAAkF;gBAClF,sCAAsC,CACzC,CAAC;QACJ,CAAC;aAAM,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,eAAO,CAAC,CAAC;IACnE,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,eAAO,CAAC,CAAC;IACnE,MAAM,mBAAmB,GAAG,KAAK,EAAE,aAAsB,EAAE,CAAS,EAAE,EAAE,CACtE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAE5D,IAAI,WAAW,GAAkB,IAAI,CAAC;IACtC,IAAI,4BAA4B,GAAG,KAAK,CAAC;IACzC,IAAI,eAAe,CAAC,aAAa,CAAC,EAAE,CAAC;QACnC,MAAM,WAAW,GAAG,MAAM,YAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,WAAW,KAAK,aAAa,CAAC,WAAW,IAAI,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YAC3F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,aAAa,CAAC,QAAQ,2BAA2B,OAAO,GAAG,CAAC,CAAC;YACrF,4BAA4B,GAAG,IAAI,CAAC;YACpC,WAAW,GAAG,aAAa,CAAC,QAAQ,CAAC;QACvC,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACjC,MAAM,2BAA2B,GAAG,CAAC,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;IAE/D,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAClC,IAAI,2BAA2B,EAAE,CAAC;YAChC,IAAI,eAAmC,CAAC;YACxC,IAAI,aAAa,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;gBAChD,eAAe,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC/C,aAAa,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;YAC7C,CAAC;YAED,WAAW,GAAG,eAAe;gBAC3B,CAAC,CAAC,MAAM,mBAAmB,CAAC,aAAa,EAAE,eAAe,CAAC;gBAC3D,CAAC,CAAC,MAAM,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAE9C,IAAI,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;gBACpB,MAAM,YAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3B,CAAC;YACD,IAAI,eAAe,KAAK,SAAS,IAAI,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC;gBAChE,MAAM,YAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACnC,CAAC;YACD,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;gBACxB,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,kDAAkD,CAAC,CAAC;YACxF,CAAC;YACD,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC;QAChC,CAAC;aAAM,IAAI,KAAK,EAAE,CAAC;YACjB,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,OAAO,2BAA2B,IAAI,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,EAAC,OAAO,EAAE,WAAW,EAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACjG,CAAC;AAED,wDAAwD;AACjD,KAAK,UAAU,OAAO;IAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,sBAAsB,CAAC,6BAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE;YACpF,uCAAkB;YAClB,qBAAY;SACb,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,6EAA6E,CAC9E,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAC1E,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IACxC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QAC7B,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QAClB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yEAAyE,CAAC,CAAC;IAC5F,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,uCAAkB,EAAE,qBAAY,CAAC,CAAC;IAC5E,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,MAAM,GACV,OAAO,CAAC,KAAK,QAAQ;YACrB,CAAC,KAAK,IAAI;YACV,QAAQ,IAAI,CAAC;YACb,OAAQ,CAAuB,CAAC,MAAM,KAAK,QAAQ;YACjD,CAAC,CAAE,CAAsB,CAAC,MAAM;YAChC,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,OAAO,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,oEAAoE,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,CAC3F,CAAC;IACJ,CAAC;AACH,CAAC;AAED,gDAAgD;AAChD,SAAS,eAAe,CAAC,KAAc;IACrC,OAAO,CACL,IAAA,qBAAa,EAAC,KAAK,CAAC;QACpB,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ;QACrC,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CACnC,CAAC;AACJ,CAAC"}

package/build/lib/utils/index.d.ts

@@ -1,4 +1,4 @@
-export * from './app';
-export * from './package';
-export * from './predicates';
+export { qualifyActivityName } from './app';
+export { getPackageInfo, getPackageInfoSync } from './package';
+export { isPlainObject, isEmptyValue, escapeRegExp } from './predicates';
 //# sourceMappingURL=index.d.ts.map

package/build/lib/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAE,kBAAkB,EAAC,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAC,aAAa,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,cAAc,CAAC"}

package/build/lib/utils/index.js

@@ -1,20 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./app"), exports);
-__exportStar(require("./package"), exports);
-__exportStar(require("./predicates"), exports);
+exports.escapeRegExp = exports.isEmptyValue = exports.isPlainObject = exports.getPackageInfoSync = exports.getPackageInfo = exports.qualifyActivityName = void 0;
+var app_1 = require("./app");
+Object.defineProperty(exports, "qualifyActivityName", { enumerable: true, get: function () { return app_1.qualifyActivityName; } });
+var package_1 = require("./package");
+Object.defineProperty(exports, "getPackageInfo", { enumerable: true, get: function () { return package_1.getPackageInfo; } });
+Object.defineProperty(exports, "getPackageInfoSync", { enumerable: true, get: function () { return package_1.getPackageInfoSync; } });
+var predicates_1 = require("./predicates");
+Object.defineProperty(exports, "isPlainObject", { enumerable: true, get: function () { return predicates_1.isPlainObject; } });
+Object.defineProperty(exports, "isEmptyValue", { enumerable: true, get: function () { return predicates_1.isEmptyValue; } });
+Object.defineProperty(exports, "escapeRegExp", { enumerable: true, get: function () { return predicates_1.escapeRegExp; } });
 //# sourceMappingURL=index.js.map

package/build/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,4CAA0B;AAC1B,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/utils/index.ts"],"names":[],"mappings":";;;AAAA,6BAA0C;AAAlC,0GAAA,mBAAmB,OAAA;AAC3B,qCAA6D;AAArD,yGAAA,cAAc,OAAA;AAAE,6GAAA,kBAAkB,OAAA;AAC1C,2CAAuE;AAA/D,2GAAA,aAAa,OAAA;AAAE,0GAAA,YAAY,OAAA;AAAE,0GAAA,YAAY,OAAA"}

package/espresso-server/app/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     alias(libs.plugins.android.application)
 }
 
-import io.appium.espressoserver.gradle.resolveCapabilityVersion
+import io.appium.espressoserver.gradle.withCapabilityVersion
 import io.appium.espressoserver.jvmtarget.AppiumJvmTarget
 import org.gradle.api.GradleException
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -19,10 +19,6 @@ val appiumJvmTarget: String by project
 val useComposeLibrary: Boolean =
     (findProperty("appiumComposeSupport") as String?)?.equals("false", ignoreCase = true) != true
 
-// Align androidTest dependency versions with :library when Espresso driver passes -PappiumJUnitVersion / -PappiumAndroidxTestVersion.
-val junitVersion = resolveCapabilityVersion("appiumJUnitVersion", libs.versions.junit.get())
-val androidxTestVersion = resolveCapabilityVersion("appiumAndroidxTestVersion", libs.versions.androidxTest.get())
-
 android {
     compileSdk = appiumCompileSdk.toInt()
     buildToolsVersion = appiumBuildTools
@@ -102,9 +98,15 @@ kotlin {
 
 dependencies {
     androidTestImplementation(project(":library"))
-    androidTestImplementation("junit:junit:$junitVersion")
-    androidTestImplementation("androidx.test:core:$androidxTestVersion")
-    androidTestImplementation("androidx.test:runner:$androidxTestVersion")
+    androidTestImplementation(libs.junit) {
+        withCapabilityVersion(project, "appiumJUnitVersion", libs.versions.junit.get())
+    }
+    androidTestImplementation(libs.androidx.test.core) {
+        withCapabilityVersion(project, "appiumAndroidxTestVersion", libs.versions.androidxTest.get())
+    }
+    androidTestImplementation(libs.androidx.test.runner) {
+        withCapabilityVersion(project, "appiumAndroidxTestVersion", libs.versions.androidxTest.get())
+    }
 
     // additionalAndroidTestDependencies placeholder (don't change or delete this line)
 }

package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu May 21 17:25:25 UTC 2026
+#Sat May 23 08:42:33 UTC 2026
 gradle.version=9.5.1

package/espresso-server/buildSrc/src/main/kotlin/io/appium/espressoserver/gradle/CapabilityVersion.kt

@@ -1,6 +1,7 @@
 package io.appium.espressoserver.gradle
 
 import org.gradle.api.Project
+import org.gradle.api.artifacts.ExternalModuleDependency
 
 /**
  * Resolves a dependency version from an optional Gradle property (e.g. `-PappiumKotlin=…` from the
@@ -10,3 +11,14 @@ fun Project.resolveCapabilityVersion(propertyName: String, catalogDefaultVersion
     val fromCapability = findProperty(propertyName)?.toString()?.trim()
     return if (!fromCapability.isNullOrEmpty()) fromCapability else catalogDefaultVersion
 }
+
+/**
+ * Applies a resolved capability version to a version-catalog dependency so `-Pappium*` overrides still work.
+ */
+fun ExternalModuleDependency.withCapabilityVersion(
+    project: Project,
+    propertyName: String,
+    catalogDefaultVersion: String,
+) {
+    version { require(project.resolveCapabilityVersion(propertyName, catalogDefaultVersion)) }
+}

package/espresso-server/gradle/libs.versions.toml

@@ -11,6 +11,26 @@ robolectric = "4.9.2"
 junit = "4.13.2"
 uiautomator = "2.2.0"
 
+[libraries]
+androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "annotation" }
+androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTest" }
+androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTest" }
+androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTest" }
+androidx-test-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref = "espresso" }
+androidx-test-espresso-web = { group = "androidx.test.espresso", name = "espresso-web", version.ref = "espresso" }
+androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiautomator" }
+androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test", version.ref = "composeUiTest" }
+androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "composeUiTest" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+nanohttpd-webserver = { group = "org.nanohttpd", name = "nanohttpd-webserver", version.ref = "nanohttpd" }
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
+kotlin-stdlib-jdk8 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
+kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }

package/espresso-server/gradle.properties

@@ -34,4 +34,4 @@ appiumSourceCompatibility=VERSION_1_8
 appiumTargetCompatibility=VERSION_1_8
 appiumJvmTarget=1.8
 
-# Dependency and plugin versions for Dependabot live in gradle/libs.versions.toml
+# Dependency and plugin versions (catalog [libraries]/[plugins]) live in gradle/libs.versions.toml

package/espresso-server/library/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 }
 
 import io.appium.espressoserver.gradle.resolveCapabilityVersion
+import io.appium.espressoserver.gradle.withCapabilityVersion
 import io.appium.espressoserver.jvmtarget.AppiumJvmTarget
 import org.gradle.api.GradleException
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -16,19 +17,6 @@ val appiumSourceCompatibility: String by project
 val appiumTargetCompatibility: String by project
 val appiumJvmTarget: String by project
 
-// Versions: defaults from gradle/libs.versions.toml; -Pappium* overrides from Espresso driver (toolsVersions / capabilities).
-val kotlinVersion = resolveCapabilityVersion("appiumKotlin", libs.versions.kotlin.get())
-val annotationVersion = resolveCapabilityVersion("appiumAnnotationVersion", libs.versions.annotation.get())
-val composeUiTestVersion =
-    resolveCapabilityVersion("appiumComposeVersion", libs.versions.composeUiTest.get())
-val gsonVersion = resolveCapabilityVersion("appiumGsonVersion", libs.versions.gson.get())
-val espressoVersion = resolveCapabilityVersion("appiumEspressoVersion", libs.versions.espresso.get())
-val nanohttpdVersion = resolveCapabilityVersion("appiumNanohttpdVersion", libs.versions.nanohttpd.get())
-val androidxTestVersion = resolveCapabilityVersion("appiumAndroidxTestVersion", libs.versions.androidxTest.get())
-val robolectricVersion = resolveCapabilityVersion("appiumRobolectricVersion", libs.versions.robolectric.get())
-val junitVersion = resolveCapabilityVersion("appiumJUnitVersion", libs.versions.junit.get())
-val uiautomatorVersion = resolveCapabilityVersion("appiumUiAutomatorVersion", libs.versions.uiautomator.get())
-
 android {
     compileSdk = appiumCompileSdk.toInt()
     buildToolsVersion = appiumBuildTools
@@ -106,39 +94,74 @@ publishing {
 dependencies {
     // additionalAppDependencies placeholder (don't change or delete this line)
 
-    api("androidx.annotation:annotation:$annotationVersion")
-    api("androidx.test.espresso:espresso-contrib:$espressoVersion") {
+    api(libs.androidx.annotation) {
+        withCapabilityVersion(project, "appiumAnnotationVersion", libs.versions.annotation.get())
+    }
+    api(libs.androidx.test.espresso.contrib) {
+        withCapabilityVersion(project, "appiumEspressoVersion", libs.versions.espresso.get())
         // Exclude transitive dependencies to limit conflicts with AndroidX libraries from AUT.
         // Link to PR with fix and discussion https://github.com/appium/appium-espresso-driver/pull/596
         isTransitive = false
     }
-    api("androidx.test.espresso:espresso-web:$espressoVersion") {
+    api(libs.androidx.test.espresso.web) {
+        withCapabilityVersion(project, "appiumEspressoVersion", libs.versions.espresso.get())
         because("Espresso Web Atoms support (mobile: webAtoms)")
     }
-    api("androidx.test.uiautomator:uiautomator:$uiautomatorVersion") {
+    api(libs.androidx.test.uiautomator) {
+        withCapabilityVersion(project, "appiumUiAutomatorVersion", libs.versions.uiautomator.get())
         because("UiAutomator support (mobile: uiautomator)")
     }
-    api("androidx.test:core:$androidxTestVersion")
-    api("androidx.test:runner:$androidxTestVersion")
-    api("androidx.test:rules:$androidxTestVersion")
-    api("com.google.code.gson:gson:$gsonVersion")
-    api("org.nanohttpd:nanohttpd-webserver:$nanohttpdVersion")
-    api("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-    api("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
-    add("composeOnApi", "androidx.compose.ui:ui-test:$composeUiTestVersion") {
+    api(libs.androidx.test.core) {
+        withCapabilityVersion(project, "appiumAndroidxTestVersion", libs.versions.androidxTest.get())
+    }
+    api(libs.androidx.test.runner) {
+        withCapabilityVersion(project, "appiumAndroidxTestVersion", libs.versions.androidxTest.get())
+    }
+    api(libs.androidx.test.rules) {
+        withCapabilityVersion(project, "appiumAndroidxTestVersion", libs.versions.androidxTest.get())
+    }
+    api(libs.gson) {
+        withCapabilityVersion(project, "appiumGsonVersion", libs.versions.gson.get())
+    }
+    api(libs.nanohttpd.webserver) {
+        withCapabilityVersion(project, "appiumNanohttpdVersion", libs.versions.nanohttpd.get())
+    }
+    api(libs.kotlin.stdlib) {
+        withCapabilityVersion(project, "appiumKotlin", libs.versions.kotlin.get())
+    }
+    api(libs.kotlin.reflect) {
+        withCapabilityVersion(project, "appiumKotlin", libs.versions.kotlin.get())
+    }
+    "composeOnApi"(libs.androidx.compose.ui.test) {
+        withCapabilityVersion(project, "appiumComposeVersion", libs.versions.composeUiTest.get())
         because("Android Compose support")
     }
-    add("composeOnApi", "androidx.compose.ui:ui-test-junit4:$composeUiTestVersion") {
+    "composeOnApi"(libs.androidx.compose.ui.test.junit4) {
+        withCapabilityVersion(project, "appiumComposeVersion", libs.versions.composeUiTest.get())
         because("Android Compose support")
     }
 
-    testImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
-    testImplementation("junit:junit:$junitVersion")
-    testImplementation("org.robolectric:robolectric:$robolectricVersion")
-    testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion")
+    testImplementation(libs.androidx.test.espresso.contrib) {
+        withCapabilityVersion(project, "appiumEspressoVersion", libs.versions.espresso.get())
+    }
+    testImplementation(libs.junit) {
+        withCapabilityVersion(project, "appiumJUnitVersion", libs.versions.junit.get())
+    }
+    testImplementation(libs.robolectric) {
+        withCapabilityVersion(project, "appiumRobolectricVersion", libs.versions.robolectric.get())
+    }
+    testImplementation(libs.kotlin.test) {
+        withCapabilityVersion(project, "appiumKotlin", libs.versions.kotlin.get())
+    }
+    testImplementation(libs.kotlin.test.junit) {
+        withCapabilityVersion(project, "appiumKotlin", libs.versions.kotlin.get())
+    }
 
     constraints {
-        api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
+        api(libs.kotlin.stdlib.jdk8) {
+            version {
+                require(resolveCapabilityVersion("appiumKotlin", libs.versions.kotlin.get()))
+            }
+        }
     }
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt

@@ -2,6 +2,6 @@ package io.appium.espressoserver.lib.helpers
 
 // This value is updated automatically by the NPM versioning script
 // It should be in sync with the NPM module version from package.json
-private const val VERSION = "8.5.1"
+private const val VERSION = "8.5.2"
 
 fun getEspressoServerVersion() = VERSION

package/lib/commands/app-install.ts

@@ -1,16 +1,19 @@
-import type {PostProcessOptions, PostProcessResult} from '@appium/types';
+import type {PostProcessOptions, PostProcessResult, CachedAppInfo} from '@appium/types';
 import {utils} from 'appium-android-driver';
 import {fs, tempDir, zip} from 'appium/support';
 import {SETTINGS_HELPER_ID} from 'io.appium.settings';
 import path from 'node:path';
 import type {EspressoDriver} from '../driver';
-import {isCachedAppInfo} from './app';
 import {TEST_APK_PKG} from './server';
+import {isPlainObject} from '../utils';
 
 export const APK_EXT = '.apk';
 export const AAB_EXT = '.aab';
 export const SUPPORTED_EXTENSIONS = [APK_EXT, AAB_EXT];
 
+/** Cached app entry with integrity path (narrower than {@link CachedAppInfo}). */
+export type StrictCachedAppInfo = CachedAppInfo & {fullPath: string};
+
 /** Whether the session targets an app already installed on the device (no app path). */
 export function isAppOnDevice(driver: EspressoDriver): boolean {
   const appPackage = driver.opts.appPackage;
@@ -175,3 +178,12 @@ export async function initAUT(this: EspressoDriver): Promise<void> {
     );
   }
 }
+
+/** Type guard for cached app metadata shape. */
+function isCachedAppInfo(value: unknown): value is StrictCachedAppInfo {
+  return (
+    isPlainObject(value) &&
+    typeof value.packageHash === 'string' &&
+    typeof value.fullPath === 'string'
+  );
+}

package/lib/utils/index.ts

@@ -1,3 +1,3 @@
-export * from './app';
-export * from './package';
-export * from './predicates';
+export {qualifyActivityName} from './app';
+export {getPackageInfo, getPackageInfoSync} from './package';
+export {isPlainObject, isEmptyValue, escapeRegExp} from './predicates';

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-espresso-driver",
-  "version": "8.5.1",
+  "version": "8.5.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-espresso-driver",
-      "version": "8.5.1",
+      "version": "8.5.2",
       "license": "Apache-2.0",
       "dependencies": {
         "appium-adb": "^15.0.0",
@@ -1425,9 +1425,9 @@
       }
     },
     "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz",
+      "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
@@ -3022,9 +3022,9 @@
       "optional": true
     },
     "node_modules/semver": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz",
-      "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.1.tgz",
+      "integrity": "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "8.5.1",
+  "version": "8.5.2",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {

package/build/lib/commands/app.d.ts

@@ -1,8 +0,0 @@
-import type { CachedAppInfo } from '@appium/types';
-/** Cached app entry with integrity path (narrower than {@link CachedAppInfo}). */
-export type StrictCachedAppInfo = CachedAppInfo & {
-    fullPath: string;
-};
-/** Type guard for cached app metadata shape. */
-export declare function isCachedAppInfo(value: unknown): value is StrictCachedAppInfo;
-//# sourceMappingURL=app.d.ts.map

package/build/lib/commands/app.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../lib/commands/app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAGjD,kFAAkF;AAClF,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC;AAErE,gDAAgD;AAChD,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAM5E"}

package/build/lib/commands/app.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCachedAppInfo = isCachedAppInfo;
-const utils_1 = require("../utils");
-/** Type guard for cached app metadata shape. */
-function isCachedAppInfo(value) {
-    return ((0, utils_1.isPlainObject)(value) &&
-        typeof value.packageHash === 'string' &&
-        typeof value.fullPath === 'string');
-}
-//# sourceMappingURL=app.js.map

package/build/lib/commands/app.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../lib/commands/app.ts"],"names":[],"mappings":";;AAOA,0CAMC;AAZD,oCAAuC;AAKvC,gDAAgD;AAChD,SAAgB,eAAe,CAAC,KAAc;IAC5C,OAAO,CACL,IAAA,qBAAa,EAAC,KAAK,CAAC;QACpB,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ;QACrC,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CACnC,CAAC;AACJ,CAAC"}

package/lib/commands/app.ts

@@ -1,14 +0,0 @@
-import type {CachedAppInfo} from '@appium/types';
-import {isPlainObject} from '../utils';
-
-/** Cached app entry with integrity path (narrower than {@link CachedAppInfo}). */
-export type StrictCachedAppInfo = CachedAppInfo & {fullPath: string};
-
-/** Type guard for cached app metadata shape. */
-export function isCachedAppInfo(value: unknown): value is StrictCachedAppInfo {
-  return (
-    isPlainObject(value) &&
-    typeof value.packageHash === 'string' &&
-    typeof value.fullPath === 'string'
-  );
-}