appium-espresso-driver 7.2.0 → 8.0.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [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
+
+* **deps-dev:** bump typescript from 5.9.3 to 6.0.3 ([#1150](https://github.com/appium/appium-espresso-driver/issues/1150)) ([3ca21c5](https://github.com/appium/appium-espresso-driver/commit/3ca21c5471830b7c7e8bb0d6cb7c9b00ca4f468a))
+
 ## [7.2.0](https://github.com/appium/appium-espresso-driver/compare/v7.1.2...v7.2.0) (2026-04-08)
 
 ### Features

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

@@ -0,0 +1,21 @@
+{
+  "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/app/build.gradle.kts

@@ -1,8 +1,11 @@
 plugins {
     id("com.android.application")
-    kotlin("android")
 }
 
+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
@@ -45,7 +48,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,15 +77,24 @@ 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")

package/espresso-server/build.gradle.kts

@@ -1,7 +1,6 @@
 // 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 {
@@ -9,7 +8,6 @@ buildscript {
         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
@@ -27,5 +25,5 @@ allprojects {
 }
 
 tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }

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

@@ -0,0 +1,2 @@
+#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

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

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

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

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/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/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,14 +28,14 @@ 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
+appiumAndroidGradlePlugin=9.1.1
+appiumKotlin=2.3.20
 appiumAndroidxTestVersion=1.5.0
 appiumAnnotationVersion=1.6.0
 appiumComposeVersion=1.1.1

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,12 @@
 plugins {
     id("com.android.library")
-    kotlin("android")
     `maven-publish`
 }
 
+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
@@ -40,10 +43,6 @@ android {
         resources.excludes.add("META-INF/**")
     }
 
-    kotlinOptions {
-        jvmTarget = appiumJvmTarget
-    }
-
     lint {
         targetSdk = appiumTargetSdk.toInt()
     }
@@ -60,6 +59,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") {

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.0"
+private const val VERSION = "8.0.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"))
         }
 
     }