appium-espresso-driver 8.0.0 → 8.1.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [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

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

@@ -1,7 +1,8 @@
 plugins {
-    id("com.android.application")
+    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
@@ -14,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()
@@ -97,9 +91,9 @@ kotlin {
 
 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,26 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-buildscript {
-    val appiumAndroidGradlePlugin: String by project
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        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"
 }
 

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/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.properties

@@ -34,15 +34,4 @@ appiumSourceCompatibility=VERSION_1_8
 appiumTargetCompatibility=VERSION_1_8
 appiumJvmTarget=1.8
 
-appiumAndroidGradlePlugin=9.1.1
-appiumKotlin=2.3.20
-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/library/build.gradle.kts

@@ -1,8 +1,9 @@
 plugins {
-    id("com.android.library")
+    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
@@ -14,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()
@@ -85,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 = "8.0.0"
+private const val VERSION = "8.1.0"
 
 fun getEspressoServerVersion() = VERSION

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": "8.0.0",
+  "version": "8.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-espresso-driver",
-      "version": "8.0.0",
+      "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"
@@ -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": "8.0.0",
+  "version": "8.1.0",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {

package/espresso-server/app/build/outputs/apk/androidTest/debug/output-metadata.json

@@ -1,21 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "io.appium.espressoserver.test",
-  "variantName": "debugAndroidTest",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 0,
-      "versionName": "",
-      "outputFile": "app-debug-androidTest.apk"
-    }
-  ],
-  "elementType": "File",
-  "minSdkVersionForDexing": 26
-}

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

@@ -1,2 +0,0 @@
-#Sat Apr 18 07:08:49 UTC 2026
-gradle.version=9.4.1

package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +0,0 @@
-1
-0

package/espresso-server/buildSrc/build/tmp/jar/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-