appium-espresso-driver 8.0.0 → 8.2.0

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [8.2.0](https://github.com/appium/appium-espresso-driver/compare/v8.1.0...v8.2.0) (2026-04-20)
+
+### Features
+
+* Add a possibility to build espresso without compose support ([#1153](https://github.com/appium/appium-espresso-driver/issues/1153)) ([1753aaa](https://github.com/appium/appium-espresso-driver/commit/1753aaa2c425bea12eca13342d8b2a0e695ae761))
+
+### Bug Fixes
+
+* allow Java 17+ ([#1154](https://github.com/appium/appium-espresso-driver/issues/1154)) ([741954d](https://github.com/appium/appium-espresso-driver/commit/741954dfc830b2040417a06fda51d7b9f4cfcf84))
+
+## [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/README.md

@@ -251,6 +251,10 @@ on the Compose usage in general:
 
 Espresso server is in tight connection with the application under test. That is why it is important that the server uses the same versions of common dependencies and there are no conflicts. Espresso driver allows to configure several build options via `espressoBuildConfig` capability. The configuration JSON supports the following entries:
 
+### composeSupport
+
+When set to `false`, the Espresso server is built **without** Jetpack Compose UI test dependencies (smaller test APK and no Compose on the classpath). The default is `true` when this key is omitted. If Compose support is disabled, setting the `driver` setting to `compose` or using Compose-only flows returns a clear server error; rebuild with `composeSupport` enabled (or remove the key) to use Compose.
+
 ### toolsVersions
 
 This entry allows to explicitly set the versions of different server components. The following map entries are supported:
@@ -283,6 +287,7 @@ The value of this entry must be a non empty array of dependent module names with
 
 ```json
 {
+  "composeSupport": false,
   "toolsVersions": {
     "androidGradlePlugin": "4.0.0"
   },

package/build/lib/server-builder.d.ts

@@ -15,15 +15,20 @@ export interface BuildServerSigningConfigArgs {
     keyPassword: string;
 }
 export declare function buildServerSigningConfig(args: BuildServerSigningConfigArgs): ServerSigningConfig;
-interface BuildConfiguration {
+export interface EspressoBuildConfiguration {
     toolsVersions?: Record<string, string>;
+    /**
+     * When false, the Espresso server is built without Jetpack Compose dependencies.
+     * Defaults to true when omitted.
+     */
+    composeSupport?: boolean;
     additionalAppDependencies?: string[];
     additionalAndroidTestDependencies?: string[];
 }
 export interface ServerBuilderOptions {
     serverPath: string;
     showGradleLog?: boolean;
-    buildConfiguration?: BuildConfiguration;
+    buildConfiguration?: EspressoBuildConfiguration;
     testAppPackage?: string;
     signingConfig?: ServerSigningConfig | null;
 }
@@ -36,6 +41,7 @@ export declare class ServerBuilder {
     private readonly signingConfig?;
     private readonly additionalAppDependencies;
     private readonly additionalAndroidTestDependencies;
+    private readonly composeSupport;
     constructor(log: AppiumLogger, args: ServerBuilderOptions);
     build(): Promise<void>;
     private getCommand;
@@ -44,5 +50,4 @@ export declare class ServerBuilder {
     private insertAdditionalDependencies;
     private runBuildProcess;
 }
-export {};
 //# sourceMappingURL=server-builder.d.ts.map

package/build/lib/server-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-builder.d.ts","sourceRoot":"","sources":["../../lib/server-builder.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAIhD,eAAO,MAAM,mBAAmB,uEACsC,CAAC;AAMvE,eAAO,MAAM,YAAY,8NAcf,CAAC;AAEX,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,4BAA4B,GAAG,mBAAmB,CAQhG;AAED,UAAU,kBAAkB;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;IACrC,iCAAiC,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9C;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;CAC5C;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyD;IACxF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAA6B;IAC5D,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAW;IACrD,OAAO,CAAC,QAAQ,CAAC,iCAAiC,CAAW;gBAEjD,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,oBAAoB;IA6BnD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,OAAO,CAAC,UAAU;YAsCJ,uBAAuB;IAYrC,OAAO,CAAC,mBAAmB;YAOb,4BAA4B;YA0C5B,eAAe;CAmC9B"}
+{"version":3,"file":"server-builder.d.ts","sourceRoot":"","sources":["../../lib/server-builder.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAIhD,eAAO,MAAM,mBAAmB,uEACsC,CAAC;AAMvE,eAAO,MAAM,YAAY,8NAcf,CAAC;AAEX,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,4BAA4B,GAAG,mBAAmB,CAQhG;AAED,MAAM,WAAW,0BAA0B;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;IACrC,iCAAiC,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9C;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,0BAA0B,CAAC;IAChD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;CAC5C;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyD;IACxF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAA6B;IAC5D,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAW;IACrD,OAAO,CAAC,QAAQ,CAAC,iCAAiC,CAAW;IAC7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;gBAE7B,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,oBAAoB;IA8BnD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,OAAO,CAAC,UAAU;YA4CJ,uBAAuB;IAYrC,OAAO,CAAC,mBAAmB;YAOb,4BAA4B;YA0C5B,eAAe;CAmC9B"}

package/build/lib/server-builder.js

@@ -51,11 +51,13 @@ class ServerBuilder {
     signingConfig;
     additionalAppDependencies;
     additionalAndroidTestDependencies;
+    composeSupport;
     constructor(log, args) {
         this.log = log;
         this.serverPath = args.serverPath;
         this.showGradleLog = args.showGradleLog;
         const buildConfiguration = args.buildConfiguration || {};
+        this.composeSupport = buildConfiguration.composeSupport !== false;
         const versionConfiguration = buildConfiguration.toolsVersions || {};
         this.serverVersions = lodash_1.default.reduce(versionConfiguration, (acc, value, key) => {
             if (exports.VERSION_KEYS.includes(key)) {
@@ -108,6 +110,12 @@ class ServerBuilder {
                 args.push(targetPackageArg);
             }
         }
+        if (!this.composeSupport) {
+            const composeArg = buildProperty('appiumComposeSupport', 'false');
+            if (composeArg) {
+                args.push(composeArg);
+            }
+        }
         args.push('app:assembleAndroidTest');
         return { cmd, args };
     }

package/build/lib/server-builder.js.map

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

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,13 @@ 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
+
+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()
@@ -32,6 +29,14 @@ android {
     namespace = "io.appium.espressoserver"
 
     defaultConfig {
+        missingDimensionStrategy(
+            "composeSupport",
+            if (useComposeLibrary) {
+                "composeOn"
+            } else {
+                "composeOff"
+            },
+        )
         // <instrumentation android:targetPackage=""/>
         applicationId = appiumTargetPackage
         // <manifest package=""/>
@@ -97,9 +102,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/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Sat Apr 18 07:08:49 UTC 2026
+#Mon Apr 20 17:45:25 UTC 2026
 gradle.version=9.4.1

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

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

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

@@ -6,8 +6,9 @@ repositories {
     mavenCentral()
 }
 
+val javaVersion = maxOf(JavaVersion.current().majorVersion.toInt(), 17)
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(javaVersion))
     }
 }

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,22 +15,42 @@ 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()
     buildToolsVersion = appiumBuildTools
     namespace = "io.appium.espressoserver.lib"
 
+    buildFeatures {
+        buildConfig = true
+    }
+
+    flavorDimensions += "composeSupport"
+    productFlavors {
+        create("composeOn") {
+            dimension = "composeSupport"
+            isDefault = true
+            buildConfigField("boolean", "COMPOSE_SUPPORT", "true")
+        }
+        create("composeOff") {
+            dimension = "composeSupport"
+            buildConfigField("boolean", "COMPOSE_SUPPORT", "false")
+        }
+    }
+
     defaultConfig {
         minSdk = appiumMinSdk.toInt()
     }
@@ -53,7 +74,7 @@ android {
     }
 
     publishing {
-        singleVariant("release") {
+        singleVariant("composeOnRelease") {
             withSourcesJar()
         }
     }
@@ -76,7 +97,7 @@ publishing {
     publications {
         register<MavenPublication>("release") {
             afterEvaluate {
-                from(components["release"])
+                from(components["composeOnRelease"])
             }
         }
     }
@@ -85,39 +106,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")
+    add("composeOnApi", "androidx.compose.ui:ui-test:$composeUiTestVersion") {
         because("Android Compose support")
     }
-    api("androidx.compose.ui:ui-test-junit4:$appiumComposeVersion") {
+    add("composeOnApi", "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")
     }
 }