appium-espresso-driver 8.5.0 → 8.5.2

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [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
+
+* Bump appium-adb to version 15 ([#1164](https://github.com/appium/appium-espresso-driver/issues/1164)) ([1b3215b](https://github.com/appium/appium-espresso-driver/commit/1b3215b567b789acb0c822080b3daac821d0192d))
+
 ## [8.5.0](https://github.com/appium/appium-espresso-driver/compare/v8.4.1...v8.5.0) (2026-05-20)
 
 ### Features

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];
@@ -60,7 +60,7 @@ async function onPostConfigureApp(opts) {
                 'Having the application under test with improper signature/non-signed will cause ' +
                 'Espresso automation startup failure.');
         }
-        else if (!(await this.adb.checkApkCert(appLocation, ''))) {
+        else if (!(await this.adb.checkApkCert(appLocation))) {
             await this.adb.sign(appLocation);
         }
     };
@@ -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":"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"}

package/build/lib/commands/server/runner.js

@@ -189,7 +189,7 @@ class EspressoRunner {
         if (!(await support_1.fs.exists(this.modServerPath))) {
             await this.buildNewModServer();
         }
-        const wasSigned = await this.adb.checkApkCert(this.modServerPath, '');
+        const wasSigned = await this.adb.checkApkCert(this.modServerPath);
         if (!wasSigned) {
             await this.adb.sign(this.modServerPath);
         }

package/build/lib/commands/server/runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"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"}

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 @@
-#Wed May 20 07:39:36 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.0"
+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;
@@ -67,7 +70,7 @@ export async function onPostConfigureApp(
           'Having the application under test with improper signature/non-signed will cause ' +
           'Espresso automation startup failure.',
       );
-    } else if (!(await this.adb.checkApkCert(appLocation, ''))) {
+    } else if (!(await this.adb.checkApkCert(appLocation))) {
       await this.adb.sign(appLocation);
     }
   };
@@ -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/commands/server/runner.ts

@@ -237,7 +237,7 @@ export class EspressoRunner {
     if (!(await fs.exists(this.modServerPath))) {
       await this.buildNewModServer();
     }
-    const wasSigned = await this.adb.checkApkCert(this.modServerPath, '');
+    const wasSigned = await this.adb.checkApkCert(this.modServerPath);
     if (!wasSigned) {
       await this.adb.sign(this.modServerPath);
     }

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,20 +1,20 @@
 {
   "name": "appium-espresso-driver",
-  "version": "8.5.0",
+  "version": "8.5.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-espresso-driver",
-      "version": "8.5.0",
+      "version": "8.5.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "appium-adb": "^14.0.0",
-        "appium-android-driver": "^13.1.0",
+        "appium-adb": "^15.0.0",
+        "appium-android-driver": "^13.2.3",
         "asyncbox": "^6.1.0",
-        "axios": "^1.12.2",
+        "axios": "^1.16.1",
         "commander": "^14.0.1",
-        "io.appium.settings": "^7.0.1",
+        "io.appium.settings": "^7.1.3",
         "portscanner": "^2.2.0",
         "semver": "^7.6.2",
         "teen_process": "^4.0.6"
@@ -538,9 +538,9 @@
       }
     },
     "node_modules/appium-adb": {
-      "version": "14.5.0",
-      "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-14.5.0.tgz",
-      "integrity": "sha512-7o+zmfSqODMH98YrCd1ryaJGv5KTr7mmLLalPp8DJzbtuncuuTrFI5R+WfSWs10WEWxxsT3Kqfv7s8f/OmB8sQ==",
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-15.0.0.tgz",
+      "integrity": "sha512-RIRCcBzVlFlO2VHXmXPzComPFQL05fs+qEtK1ftVtB4kEggk+ewfD8VSI0ZuUGOD8NQlNusDgRQV8p/LKlNryg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/support": "^7.2.2",
@@ -557,18 +557,18 @@
       }
     },
     "node_modules/appium-android-driver": {
-      "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-13.2.2.tgz",
-      "integrity": "sha512-Mblt0QrV7HVrj++WWwArJXvI+jGQ+Fj4jLd+6p3a2rjwVvyTuygm1tr/8C8UBQQoqoBm4WViYDHBFmScTCaDfw==",
+      "version": "13.2.3",
+      "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-13.2.3.tgz",
+      "integrity": "sha512-U3Qp0rDvLM7RZc2XnN7h7xYos78g9pVkWSXi96tGpZAr0MH952XLerc1mpKMnTUxxtniN0+9VeuyiDel0q8+2w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/support": "^7.2.2",
         "@colors/colors": "^1.6.0",
-        "appium-adb": "^14.3.0",
-        "appium-chromedriver": "^8.2.25",
+        "appium-adb": "^15.0.0",
+        "appium-chromedriver": "^8.4.4",
         "asyncbox": "^6.1.0",
         "axios": "^1.16.0",
-        "io.appium.settings": "^7.0.4",
+        "io.appium.settings": "^7.1.3",
         "lodash": "^4.17.4",
         "lru-cache": "^11.1.0",
         "moment": "^2.24.0",
@@ -587,15 +587,15 @@
       }
     },
     "node_modules/appium-chromedriver": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-8.4.2.tgz",
-      "integrity": "sha512-3BrzlLpbc848oQfEkVmLXYYpagBCNCthxVITjZy89Bf3i6XSxV/Yv2RTyuxK2/pdgonXPjxEXYcqHrbVPr6nng==",
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-8.4.4.tgz",
+      "integrity": "sha512-JYJyJYb8m1uskNM7to0dG11Gj2bwusdOKFukoSubAH8nBJHT2RHo2e/i1vu9TR1ZlkU7AFDN2Na1FZ4MDlDG6w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/base-driver": "^10.0.0-rc.2",
         "@appium/support": "^7.2.2",
         "@xmldom/xmldom": "^0.x",
-        "appium-adb": "^14.0.0",
+        "appium-adb": "^15.0.0",
         "asyncbox": "^6.0.1",
         "axios": "^1.16.0",
         "compare-versions": "^6.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"
@@ -2081,9 +2081,9 @@
       }
     },
     "node_modules/io.appium.settings": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-7.1.2.tgz",
-      "integrity": "sha512-WdvMHAO3aH6cfzg0bcTxowH/QvqBydkFfnacpoNt/+nZeLCp+TcUSci+v8EZWG+GcEzQ9wK6w0ycU8S1mmqEEg==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-7.1.3.tgz",
+      "integrity": "sha512-GHyn/eHctGVY/OHO8VoWFFCVAbNWOn+b4QiTMYTyFnRmaVuMVvotZYxlgQgs3pUxRrqG1U755gZ4Nyw18OrpUA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/logger": "^2.0.0-rc.1",
@@ -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.0",
+  "version": "8.5.2",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -74,12 +74,12 @@
     "npm-shrinkwrap.json"
   ],
   "dependencies": {
-    "appium-adb": "^14.0.0",
-    "appium-android-driver": "^13.1.0",
+    "appium-adb": "^15.0.0",
+    "appium-android-driver": "^13.2.3",
     "asyncbox": "^6.1.0",
-    "axios": "^1.12.2",
+    "axios": "^1.16.1",
     "commander": "^14.0.1",
-    "io.appium.settings": "^7.0.1",
+    "io.appium.settings": "^7.1.3",
     "portscanner": "^2.2.0",
     "semver": "^7.6.2",
     "teen_process": "^4.0.6"

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'
-  );
-}