appium-espresso-driver 7.2.1 → 8.1.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [8.1.0](https://github.com/appium/appium-espresso-driver/compare/v8.0.0...v8.1.0) (2026-04-18)
+
+### Features
+
+* add version catalog for Dependabot ([#1152](https://github.com/appium/appium-espresso-driver/issues/1152)) ([16ce10e](https://github.com/appium/appium-espresso-driver/commit/16ce10ea5e32ece75d5e7e55307d2fe2ccc20bc7))
+
+## [8.0.0](https://github.com/appium/appium-espresso-driver/compare/v7.2.1...v8.0.0) (2026-04-18)
+
+### ⚠ BREAKING CHANGES
+
+* The default kotlin version is set to 2.3.20
+* The required build tools version is set to 36.0.0
+* Dropped AGP 8.x
+
+### Features
+
+* Bump Gradle version ([#1151](https://github.com/appium/appium-espresso-driver/issues/1151)) ([1ae46bd](https://github.com/appium/appium-espresso-driver/commit/1ae46bd5025674e74bbf298c2d70a70b91e4eb60))
+
 ## [7.2.1](https://github.com/appium/appium-espresso-driver/compare/v7.2.0...v7.2.1) (2026-04-17)
 
 ### Miscellaneous Chores

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

@@ -1,8 +1,12 @@
 plugins {
-    id("com.android.application")
-    kotlin("android")
+    alias(libs.plugins.android.application)
 }
 
+import io.appium.espressoserver.gradle.resolveCapabilityVersion
+import io.appium.espressoserver.jvmtarget.AppiumJvmTarget
+import org.gradle.api.GradleException
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 val appiumCompileSdk: String by project
 val appiumMinSdk: String by project
 val appiumTargetSdk: String by project
@@ -11,17 +15,10 @@ val appiumTargetPackage: String by project
 val appiumSourceCompatibility: String by project
 val appiumTargetCompatibility: String by project
 val appiumJvmTarget: String by project
-val appiumKotlin: String by project
-val appiumAndroidxTestVersion: String by project
-val appiumAnnotationVersion: String by project
-val appiumComposeVersion: String by project
-val appiumGsonVersion: String by project
-val appiumEspressoVersion: String by project
-val appiumMockitoVersion: String by project
-val appiumNanohttpdVersion: String by project
-val appiumRobolectricVersion: String by project
-val appiumJUnitVersion: String by project
-val appiumUiAutomatorVersion: String by project
+
+// 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()
@@ -45,7 +42,7 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
 
@@ -74,20 +71,29 @@ android {
         targetCompatibility = JavaVersion.valueOf(appiumTargetCompatibility.uppercase())
     }
 
-    kotlinOptions {
-        jvmTarget = appiumJvmTarget
-    }
-
     packaging {
         resources.excludes.add("META-INF/**")
     }
 }
 
+kotlin {
+    compilerOptions {
+        val normalized = AppiumJvmTarget.resolveNormalized(appiumJvmTarget)
+        jvmTarget.set(
+            JvmTarget.entries.firstOrNull { it.target == normalized }
+                ?: throw GradleException(
+                    "Unsupported appiumJvmTarget \"$appiumJvmTarget\" (normalized \"$normalized\"). " +
+                        "Use one of: ${JvmTarget.entries.joinToString { it.target }}",
+                ),
+        )
+    }
+}
+
 dependencies {
     androidTestImplementation(project(":library"))
-    androidTestImplementation("junit:junit:$appiumJUnitVersion")
-    androidTestImplementation("androidx.test:core:$appiumAndroidxTestVersion")
-    androidTestImplementation("androidx.test:runner:$appiumAndroidxTestVersion")
+    androidTestImplementation("junit:junit:$junitVersion")
+    androidTestImplementation("androidx.test:core:$androidxTestVersion")
+    androidTestImplementation("androidx.test:runner:$androidxTestVersion")
 
     // additionalAndroidTestDependencies placeholder (don't change or delete this line)
 }

package/espresso-server/build.gradle.kts

@@ -1,31 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-buildscript {
-    val appiumKotlin: String by project
-    val appiumAndroidGradlePlugin: String by project
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$appiumKotlin")
-        classpath("com.android.tools.build:gradle:$appiumAndroidGradlePlugin")
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle.kts files
-    }
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
 }
 
 allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
     group = "io.appium.espressoserver"
 }
 
 tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }

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

@@ -0,0 +1,13 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}

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

@@ -0,0 +1,12 @@
+package io.appium.espressoserver.gradle
+
+import org.gradle.api.Project
+
+/**
+ * Resolves a dependency version from an optional Gradle property (e.g. `-PappiumKotlin=…` from the
+ * Espresso driver's `toolsVersions` / `espressoBuildConfig`) with fallback to the version catalog default.
+ */
+fun Project.resolveCapabilityVersion(propertyName: String, catalogDefaultVersion: String): String {
+    val fromCapability = findProperty(propertyName)?.toString()?.trim()
+    return if (!fromCapability.isNullOrEmpty()) fromCapability else catalogDefaultVersion
+}

package/espresso-server/buildSrc/src/main/kotlin/io/appium/espressoserver/jvmtarget/AppiumJvmTarget.kt

@@ -0,0 +1,54 @@
+package io.appium.espressoserver.jvmtarget
+
+import org.gradle.api.GradleException
+
+/**
+ * Normalizes and validates `appiumJvmTarget` / `-PappiumJvmTarget=…` from Gradle properties.
+ *
+ * Normalizes values (e.g. `1_8`, `8`, `VERSION_1_8`). Default `1.8` is the project baseline for emitted JVM
+ * bytecode (Java 8 language level). Call sites map the returned string to [org.jetbrains.kotlin.gradle.dsl.JvmTarget].
+ */
+object AppiumJvmTarget {
+
+    private fun normalizeAppiumJvmTarget(raw: String): String {
+        val trimmed = raw.trim()
+        if (trimmed.isEmpty()) {
+            return "1.8"
+        }
+        val withoutVersionPrefix = Regex("^VERSION_", RegexOption.IGNORE_CASE).replace(trimmed, "")
+        val dotted = withoutVersionPrefix.replace('_', '.')
+        return when (dotted) {
+            "8" -> "1.8"
+            else -> dotted
+        }
+    }
+
+    /** Java bytecode level as a single integer (8 for 1.8, 11, 17, …). */
+    private fun jvmBytecodeLevel(normalizedTarget: String): Int =
+        when {
+            normalizedTarget == "1.8" -> 8
+            normalizedTarget.startsWith("1.") ->
+                throw GradleException(
+                    "Unsupported JVM target \"$normalizedTarget\". Use 1.8 (Java 8) for legacy 1.x bytecode.",
+                )
+            else ->
+                normalizedTarget.toIntOrNull()
+                    ?: throw GradleException(
+                        "Invalid appiumJvmTarget \"$normalizedTarget\" (expected e.g. 1.8, 11, or 17).",
+                    )
+        }
+
+    /**
+     * Returns the normalized JVM target string (e.g. `1.8`, `17`) for Kotlin [org.jetbrains.kotlin.gradle.dsl.JvmTarget].
+     */
+    fun resolveNormalized(appiumJvmTargetProperty: String): String {
+        val normalized = normalizeAppiumJvmTarget(appiumJvmTargetProperty)
+        val level = jvmBytecodeLevel(normalized)
+        if (level < 8) {
+            throw GradleException(
+                "Minimum supported appiumJvmTarget is 1.8 / Java 8 (bytecode level was $level from \"$appiumJvmTargetProperty\").",
+            )
+        }
+        return normalized
+    }
+}

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

@@ -0,0 +1,16 @@
+[versions]
+androidGradlePlugin = "9.1.1"
+kotlin = "2.3.20"
+androidxTest = "1.5.0"
+annotation = "1.6.0"
+composeUiTest = "1.1.1"
+gson = "2.10.1"
+espresso = "3.5.1"
+nanohttpd = "2.3.1"
+robolectric = "4.9.2"
+junit = "4.13.2"
+uiautomator = "2.2.0"
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }

package/espresso-server/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/espresso-server/gradle.properties

@@ -28,21 +28,10 @@ kotlin.stdlib.default.dependency=false
 appiumCompileSdk=34
 appiumMinSdk=26
 appiumTargetSdk=34
-appiumBuildTools=34.0.0
+appiumBuildTools=36.0.0
 appiumTargetPackage=io.appium.espressoserver
 appiumSourceCompatibility=VERSION_1_8
 appiumTargetCompatibility=VERSION_1_8
 appiumJvmTarget=1.8
 
-appiumAndroidGradlePlugin=8.13.0
-appiumKotlin=1.8.10
-appiumAndroidxTestVersion=1.5.0
-appiumAnnotationVersion=1.6.0
-appiumComposeVersion=1.1.1
-appiumGsonVersion=2.10.1
-appiumEspressoVersion=3.5.1
-appiumMockitoVersion=5.1.1
-appiumNanohttpdVersion=2.3.1
-appiumRobolectricVersion=4.9.2
-appiumJUnitVersion=4.13.2
-appiumUiAutomatorVersion=2.2.0
+# Dependency and plugin versions for Dependabot live in gradle/libs.versions.toml

package/espresso-server/gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

package/espresso-server/gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

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

@@ -1,9 +1,13 @@
 plugins {
-    id("com.android.library")
-    kotlin("android")
+    alias(libs.plugins.android.library)
     `maven-publish`
 }
 
+import io.appium.espressoserver.gradle.resolveCapabilityVersion
+import io.appium.espressoserver.jvmtarget.AppiumJvmTarget
+import org.gradle.api.GradleException
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 val appiumCompileSdk: String by project
 val appiumMinSdk: String by project
 val appiumTargetSdk: String by project
@@ -11,16 +15,19 @@ val appiumBuildTools: String by project
 val appiumSourceCompatibility: String by project
 val appiumTargetCompatibility: String by project
 val appiumJvmTarget: String by project
-val appiumKotlin: String by project
-val appiumAndroidxTestVersion: String by project
-val appiumAnnotationVersion: String by project
-val appiumComposeVersion: String by project
-val appiumGsonVersion: String by project
-val appiumEspressoVersion: String by project
-val appiumNanohttpdVersion: String by project
-val appiumRobolectricVersion: String by project
-val appiumJUnitVersion: String by project
-val appiumUiAutomatorVersion: 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()
@@ -40,10 +47,6 @@ android {
         resources.excludes.add("META-INF/**")
     }
 
-    kotlinOptions {
-        jvmTarget = appiumJvmTarget
-    }
-
     lint {
         targetSdk = appiumTargetSdk.toInt()
     }
@@ -60,6 +63,19 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        val normalized = AppiumJvmTarget.resolveNormalized(appiumJvmTarget)
+        jvmTarget.set(
+            JvmTarget.entries.firstOrNull { it.target == normalized }
+                ?: throw GradleException(
+                    "Unsupported appiumJvmTarget \"$appiumJvmTarget\" (normalized \"$normalized\"). " +
+                        "Use one of: ${JvmTarget.entries.joinToString { it.target }}",
+                ),
+        )
+    }
+}
+
 publishing {
     publications {
         register<MavenPublication>("release") {
@@ -73,39 +89,39 @@ publishing {
 dependencies {
     // additionalAppDependencies placeholder (don't change or delete this line)
 
-    api("androidx.annotation:annotation:$appiumAnnotationVersion")
-    api("androidx.test.espresso:espresso-contrib:$appiumEspressoVersion") {
+    api("androidx.annotation:annotation:$annotationVersion")
+    api("androidx.test.espresso:espresso-contrib:$espressoVersion") {
         // 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:$appiumEspressoVersion") {
+    api("androidx.test.espresso:espresso-web:$espressoVersion") {
         because("Espresso Web Atoms support (mobile: webAtoms)")
     }
-    api("androidx.test.uiautomator:uiautomator:$appiumUiAutomatorVersion") {
+    api("androidx.test.uiautomator:uiautomator:$uiautomatorVersion") {
         because("UiAutomator support (mobile: uiautomator)")
     }
-    api("androidx.test:core:$appiumAndroidxTestVersion")
-    api("androidx.test:runner:$appiumAndroidxTestVersion")
-    api("androidx.test:rules:$appiumAndroidxTestVersion")
-    api("com.google.code.gson:gson:$appiumGsonVersion")
-    api("org.nanohttpd:nanohttpd-webserver:$appiumNanohttpdVersion")
-    api("org.jetbrains.kotlin:kotlin-stdlib:$appiumKotlin")
-    api("org.jetbrains.kotlin:kotlin-reflect:$appiumKotlin")
-    api("androidx.compose.ui:ui-test:$appiumComposeVersion") {
+    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")
+    api("androidx.compose.ui:ui-test:$composeUiTestVersion") {
         because("Android Compose support")
     }
-    api("androidx.compose.ui:ui-test-junit4:$appiumComposeVersion") {
+    api("androidx.compose.ui:ui-test-junit4:$composeUiTestVersion") {
         because("Android Compose support")
     }
 
-    testImplementation("androidx.test.espresso:espresso-contrib:$appiumEspressoVersion")
-    testImplementation("junit:junit:$appiumJUnitVersion")
-    testImplementation("org.robolectric:robolectric:$appiumRobolectricVersion")
-    testImplementation("org.jetbrains.kotlin:kotlin-test:$appiumKotlin")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$appiumKotlin")
+    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")
 
     constraints {
-        api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$appiumKotlin")
+        api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     }
 }

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 = "7.2.1"
+private const val VERSION = "8.1.0"
 
 fun getEspressoServerVersion() = VERSION

package/espresso-server/library/src/test/java/io/appium/espressoserver/test/model/web/WebAtomTest.kt

@@ -49,7 +49,7 @@ class WebAtomTest {
         jsonObject.add("args", argsArr)
         val webAtom = WebAtomDeserializer().deserialize(jsonObject, null, null)
         assertEquals(webAtom.name, "someFakeAtom")
-        assertTrue(webAtom.args contentEquals arrayOf("hello", true, 100, 1.1))
+        assertTrue(webAtom.args contentEquals arrayOf<Any>("hello", true, 100, 1.1))
         assertEquals(webAtom.args.size, 4)
     }
 
@@ -63,6 +63,6 @@ class WebAtomTest {
         jsonObject.add("locator", locatorObject)
         val webAtom = WebAtomDeserializer().deserialize(jsonObject, null, null)
         assertEquals(webAtom.name, "findElement")
-        assertTrue(webAtom.args contentEquals arrayOf(Locator.ID, "some_html_id"))
+        assertTrue(webAtom.args contentEquals arrayOf<Any>(Locator.ID, "some_html_id"))
     }
 }

package/espresso-server/library/src/test/java/io/appium/espressoserver/test/model/web/WebAtomsTest.kt

@@ -24,7 +24,7 @@ class WebAtomsTest {
         }""".trimIndent(), WebAtomsMethod::class.java)
         assertEquals(webAtomsMethod.name, "withElement")
         assertEquals(webAtomsMethod.atom.name, "findElement")
-        assertTrue(webAtomsMethod.atom.args contentEquals  arrayOf(Locator.ID, "text_input"))
+        assertTrue(webAtomsMethod.atom.args contentEquals arrayOf<Any>(Locator.ID, "text_input"))
     }
 
     @Test
@@ -77,7 +77,7 @@ class WebAtomsTest {
         webAtoms.methodChain[0].let {
             assertEquals(it.name, "withElement")
             assertEquals(it.atom.name, "findElement")
-            assertTrue(it.atom.args contentEquals arrayOf(Locator.ID, "text_input"))
+            assertTrue(it.atom.args contentEquals arrayOf<Any>(Locator.ID, "text_input"))
         }
 
         webAtoms.methodChain[1].let {
@@ -89,7 +89,7 @@ class WebAtomsTest {
         webAtoms.methodChain[2].let {
             assertEquals(it.name, "perform")
             assertEquals(it.atom.name, "webKeys")
-            assertTrue(it.atom.args contentEquals  arrayOf("Foo"))
+            assertTrue(it.atom.args contentEquals arrayOf<Any>("Foo"))
         }
 
     }

package/espresso-server/settings.gradle.kts

@@ -1,2 +1,32 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    // When Espresso driver passes -PappiumAndroidGradlePlugin, override the AGP version from the
+    // version catalog. Otherwise keep Gradle's catalog-resolved requested version (no regex/TOML parse).
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "com.android.application" || requested.id.id == "com.android.library") {
+                val fromCapability =
+                    providers.gradleProperty("appiumAndroidGradlePlugin").orNull?.trim()?.takeIf { it.isNotEmpty() }
+                if (fromCapability != null) {
+                    useVersion(fromCapability)
+                }
+            }
+        }
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
 include(":app")
 include(":library")

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-espresso-driver",
-  "version": "7.2.1",
+  "version": "8.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-espresso-driver",
-      "version": "7.2.1",
+      "version": "8.1.0",
       "license": "Apache-2.0",
       "dependencies": {
         "appium-adb": "^14.0.0",
@@ -421,9 +421,9 @@
       "license": "MIT"
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.9.tgz",
-      "integrity": "sha512-qycIHAucxy/LXAYIjmLmtQ8q9GPnMbnjG1KXhWm9o5sCr6pOYDATkMPiTNa6/v8eELyqOQ2FsEqeoFYmgv/gJg==",
+      "version": "0.9.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.10.tgz",
+      "integrity": "sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==",
       "license": "MIT",
       "engines": {
         "node": ">=14.6"
@@ -812,9 +812,9 @@
       }
     },
     "node_modules/bare-url": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.4.0.tgz",
-      "integrity": "sha512-NSTU5WN+fy/L0DDenfE8SXQna4voXuW0FHM7wH8i3/q9khUSchfPbPezO4zSFMnDGIf9YE+mt/RWhZgNRKRIXA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.4.1.tgz",
+      "integrity": "sha512-fZapLWNB25gS+etK27NV9KgBNXgo2yeYHuj+OyPblQd6GYAE3JVy6aKxszMV5jhGGFwraXQKA5fldvf3lMyEqw==",
       "license": "Apache-2.0",
       "dependencies": {
         "bare-path": "^3.0.0"
@@ -1872,9 +1872,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz",
+      "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==",
       "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -2031,9 +2031,9 @@
       }
     },
     "node_modules/io.appium.settings": {
-      "version": "7.0.22",
-      "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-7.0.22.tgz",
-      "integrity": "sha512-LBKquRGIRfYG9qk8Y2CkOhuk4dDRSGNzcPoMy5a2/lopTpHPvJz+FQOXfcPVQ23qgbCE7GJH7chYKvlJrFOPZA==",
+      "version": "7.0.23",
+      "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-7.0.23.tgz",
+      "integrity": "sha512-/Tx216t06td2/mPY3+RjO///5qF0NUqStZm2BW6/3mUCwxHdRw+e9+S/QwOsGKNDAvEIyQ6VR+JCdxy1DHCscA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/logger": "^2.0.0-rc.1",
@@ -2704,9 +2704,9 @@
       }
     },
     "node_modules/plist/node_modules/@xmldom/xmldom": {
-      "version": "0.8.12",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.12.tgz",
-      "integrity": "sha512-9k/gHF6n/pAi/9tqr3m3aqkuiNosYTurLLUtc7xQ9sxB/wm7WPygCv8GYa6mS0fLJEHhqMC1ATYhz++U/lRHqg==",
+      "version": "0.8.13",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.13.tgz",
+      "integrity": "sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "7.2.1",
+  "version": "8.1.0",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -64,6 +64,7 @@
     "espresso-server/gradlew.bat",
     "espresso-server/gradle.properties",
     "espresso-server/build.gradle.kts",
+    "espresso-server/buildSrc",
     "espresso-server/settings.gradle.kts",
     "espresso-server/lint.xml",
     "!.DS_Store",