appium-espresso-driver 2.0.1 → 2.1.2

package/build/lib/server-builder.js

@@ -171,7 +171,8 @@ class ServerBuilder {
 
     const gradlebuild = new _teen_process.SubProcess(cmd, args, {
       cwd: this.serverPath,
-      stdio: ['ignore', 'pipe', 'pipe']
+      stdio: ['ignore', 'pipe', 'pipe'],
+      windowsVerbatimArguments: true
     });
     let buildLastLines = [];
     const logMsg = `Output from Gradle ${this.showGradleLog ? 'will' : 'will not'} be logged`;
@@ -211,4 +212,4 @@ var _default = ServerBuilder;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/server-builder.js"],"names":["GRADLE_VERSION_KEY","GRADLE_URL_PREFIX","GRADLE_URL_TEMPLATE","GRADLE_MAX_ERROR_LOG_LINES","DEPENDENCY_PROP_NAMES","VERSION_KEYS","gradleLog","logger","getLogger","buildServerSigningConfig","args","zipAlign","keystoreFile","keystorePassword","keyAlias","keyPassword","ServerBuilder","constructor","serverPath","showGradleLog","buildConfiguration","versionConfiguration","toolsVersions","serverVersions","_","reduce","acc","value","key","includes","log","warn","testAppPackage","signingConfig","propName","build","setGradleWrapperVersion","insertAdditionalDependencies","runBuildProcess","getCommand","cmd","system","isWindows","buildProperty","filter","map","serverVersion","gradleProperty","charAt","toUpperCase","slice","Boolean","push","keys","upperFirst","k","v","version","propertiesPath","path","resolve","originalProperties","fs","readFile","newProperties","updateGradleDistUrl","writeFile","propertiesContent","replace","RegExp","escapeRegExp","hasAdditionalDeps","isArray","Error","isEmpty","line","trim","dep","test","buildPath","configuration","prefix","deps","info","debug","join","gradlebuild","SubProcess","cwd","stdio","buildLastLines","logMsg","on","startsWith","EOL","length","start","err","msg","message","errorAndThrow"],"mappings":"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","sourcesContent":["import { SubProcess } from 'teen_process';\nimport { fs, logger, system } from '@appium/support';\nimport _ from 'lodash';\nimport log from './logger';\nimport path from 'path';\nimport { EOL } from 'os';\nimport { updateDependencyLines } from './utils';\n\nconst GRADLE_VERSION_KEY = 'gradle';\nconst GRADLE_URL_PREFIX = 'distributionUrl=';\nconst GRADLE_URL_TEMPLATE = 'https\\\\://services.gradle.org/distributions/gradle-VERSION-all.zip';\nconst GRADLE_MAX_ERROR_LOG_LINES = 15;\nconst DEPENDENCY_PROP_NAMES = ['additionalAppDependencies', 'additionalAndroidTestDependencies'];\n\nconst VERSION_KEYS = [\n  GRADLE_VERSION_KEY,\n  'androidGradlePlugin',\n  'compileSdk',\n  'buildTools',\n  'minSdk',\n  'targetSdk',\n  'kotlin',\n  'sourceCompatibility',\n  'targetCompatibility',\n  'jvmTarget',\n];\n\nconst gradleLog = logger.getLogger('Gradle');\n\nfunction buildServerSigningConfig (args) {\n  return {\n    zipAlign: true,\n    keystoreFile: args.keystoreFile,\n    keystorePassword: args.keystorePassword,\n    keyAlias: args.keyAlias,\n    keyPassword: args.keyPassword\n  };\n}\n\nclass ServerBuilder {\n  constructor (args = {}) {\n    this.serverPath = args.serverPath;\n    this.showGradleLog = args.showGradleLog;\n\n    const buildConfiguration = args.buildConfiguration || {};\n\n    const versionConfiguration = buildConfiguration.toolsVersions || {};\n    this.serverVersions = _.reduce(versionConfiguration, (acc, value, key) => {\n      if (VERSION_KEYS.includes(key)) {\n        acc[key] = value;\n      } else {\n        log.warn(`Got unexpected '${key}' in toolsVersion block of the build configuration`);\n      }\n      return acc;\n    }, {});\n\n    this.testAppPackage = args.testAppPackage;\n    this.signingConfig = args.signingConfig;\n\n    for (const propName of DEPENDENCY_PROP_NAMES) {\n      this[propName] = buildConfiguration[propName] || [];\n    }\n  }\n\n  async build () {\n    if (this.serverVersions[GRADLE_VERSION_KEY]) {\n      await this.setGradleWrapperVersion(this.serverVersions[GRADLE_VERSION_KEY]);\n    }\n\n    await this.insertAdditionalDependencies();\n\n    await this.runBuildProcess();\n  }\n\n  getCommand () {\n    const cmd = system.isWindows() ? 'gradlew.bat' : './gradlew';\n    const buildProperty = (key, value) => value ? `-P${key}=${value}` : null;\n    let args = VERSION_KEYS\n      .filter((key) => key !== GRADLE_VERSION_KEY)\n      .map((key) => {\n        const serverVersion = this.serverVersions[key];\n        const gradleProperty = `appium${key.charAt(0).toUpperCase()}${key.slice(1)}`;\n        return buildProperty(gradleProperty, serverVersion);\n      })\n      .filter(Boolean);\n\n    if (this.signingConfig) {\n      args.push(...(\n        _.keys(this.signingConfig)\n        .map((key) => [`appium${_.upperFirst(key)}`, this.signingConfig[key]])\n        .map(([k, v]) => buildProperty(k, v))\n        .filter(Boolean)\n      ));\n    }\n\n    if (this.testAppPackage) {\n      args.push(buildProperty('appiumTargetPackage', this.testAppPackage));\n    }\n    args.push('app:assembleAndroidTest');\n\n    return {cmd, args};\n  }\n\n  async setGradleWrapperVersion (version) {\n    const propertiesPath = path.resolve(this.serverPath, 'gradle', 'wrapper', 'gradle-wrapper.properties');\n    const originalProperties = await fs.readFile(propertiesPath, 'utf8');\n    const newProperties = this.updateGradleDistUrl(originalProperties, version);\n    await fs.writeFile(propertiesPath, newProperties, 'utf8');\n  }\n\n  updateGradleDistUrl (propertiesContent, version) {\n    return propertiesContent.replace(\n      new RegExp(`^(${_.escapeRegExp(GRADLE_URL_PREFIX)}).+$`, 'gm'),\n      `$1${GRADLE_URL_TEMPLATE.replace('VERSION', version)}`\n    );\n  }\n\n  async insertAdditionalDependencies () {\n    let hasAdditionalDeps = false;\n    for (const propName of DEPENDENCY_PROP_NAMES) {\n      if (!_.isArray(this[propName])) {\n        throw new Error(`'${propName}' must be an array`);\n      }\n      if (_.isEmpty(this[propName].filter((line) => _.trim(line)))) {\n        continue;\n      }\n\n      for (const dep of this[propName]) {\n        if (/[\\s'\\\\$]/.test(dep)) {\n          throw new Error('Single quotes, dollar characters and whitespace characters' +\n            ` are disallowed in additional dependencies: ${dep}`);\n        }\n      }\n      hasAdditionalDeps = true;\n    }\n    if (!hasAdditionalDeps) {\n      return;\n    }\n\n    const buildPath = path.resolve(this.serverPath, 'app', 'build.gradle.kts');\n    let configuration = await fs.readFile(buildPath, 'utf8');\n    for (const propName of DEPENDENCY_PROP_NAMES) {\n      const prefix = propName === DEPENDENCY_PROP_NAMES[0]\n        ? 'implementation'\n        : 'androidTestImplementation';\n      const deps = this[propName]\n        .filter((line) => _.trim(line))\n        .map((line) => `${prefix}(\"${line}\")`);\n      if (_.isEmpty(deps)) {\n        continue;\n      }\n\n      log.info(`Adding the following ${propName} to build.gradle.kts: ${deps}`);\n      configuration = updateDependencyLines(configuration, propName, deps);\n    }\n    await fs.writeFile(buildPath, configuration, 'utf8');\n  }\n\n  async runBuildProcess () {\n    const {cmd, args} = this.getCommand();\n    log.debug(`Beginning build with command '${cmd} ${args.join(' ')}' ` +\n      `in directory '${this.serverPath}'`);\n    const gradlebuild = new SubProcess(cmd, args, {\n      cwd: this.serverPath,\n      stdio: ['ignore', 'pipe', 'pipe'],\n    });\n    let buildLastLines = [];\n\n    const logMsg = `Output from Gradle ${this.showGradleLog ? 'will' : 'will not'} be logged`;\n    log.debug(`${logMsg}. To change this, use 'showGradleLog' desired capability`);\n    gradlebuild.on('stream-line', (line) => {\n      if (this.showGradleLog) {\n        if (line.startsWith('[STDERR]')) {\n          gradleLog.warn(line);\n        } else {\n          gradleLog.info(line);\n        }\n      }\n      buildLastLines.push(`${EOL}${line}`);\n      if (buildLastLines.length > GRADLE_MAX_ERROR_LOG_LINES) {\n        buildLastLines = buildLastLines.slice(-GRADLE_MAX_ERROR_LOG_LINES);\n      }\n    });\n\n    try {\n      await gradlebuild.start();\n      await gradlebuild.join();\n    } catch (err) {\n      let msg = `Unable to build Espresso server - ${err.message}\\n` +\n        `Gradle error message:${EOL}${buildLastLines}`;\n      log.errorAndThrow(msg);\n    }\n  }\n}\n\nexport { ServerBuilder, VERSION_KEYS, GRADLE_URL_TEMPLATE, buildServerSigningConfig };\nexport default ServerBuilder;\n"],"file":"lib/server-builder.js","sourceRoot":"../.."}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/server-builder.js"],"names":["GRADLE_VERSION_KEY","GRADLE_URL_PREFIX","GRADLE_URL_TEMPLATE","GRADLE_MAX_ERROR_LOG_LINES","DEPENDENCY_PROP_NAMES","VERSION_KEYS","gradleLog","logger","getLogger","buildServerSigningConfig","args","zipAlign","keystoreFile","keystorePassword","keyAlias","keyPassword","ServerBuilder","constructor","serverPath","showGradleLog","buildConfiguration","versionConfiguration","toolsVersions","serverVersions","_","reduce","acc","value","key","includes","log","warn","testAppPackage","signingConfig","propName","build","setGradleWrapperVersion","insertAdditionalDependencies","runBuildProcess","getCommand","cmd","system","isWindows","buildProperty","filter","map","serverVersion","gradleProperty","charAt","toUpperCase","slice","Boolean","push","keys","upperFirst","k","v","version","propertiesPath","path","resolve","originalProperties","fs","readFile","newProperties","updateGradleDistUrl","writeFile","propertiesContent","replace","RegExp","escapeRegExp","hasAdditionalDeps","isArray","Error","isEmpty","line","trim","dep","test","buildPath","configuration","prefix","deps","info","debug","join","gradlebuild","SubProcess","cwd","stdio","windowsVerbatimArguments","buildLastLines","logMsg","on","startsWith","EOL","length","start","err","msg","message","errorAndThrow"],"mappings":"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","sourcesContent":["import { SubProcess } from 'teen_process';\nimport { fs, logger, system } from '@appium/support';\nimport _ from 'lodash';\nimport log from './logger';\nimport path from 'path';\nimport { EOL } from 'os';\nimport { updateDependencyLines } from './utils';\n\nconst GRADLE_VERSION_KEY = 'gradle';\nconst GRADLE_URL_PREFIX = 'distributionUrl=';\nconst GRADLE_URL_TEMPLATE = 'https\\\\://services.gradle.org/distributions/gradle-VERSION-all.zip';\nconst GRADLE_MAX_ERROR_LOG_LINES = 15;\nconst DEPENDENCY_PROP_NAMES = ['additionalAppDependencies', 'additionalAndroidTestDependencies'];\n\nconst VERSION_KEYS = [\n  GRADLE_VERSION_KEY,\n  'androidGradlePlugin',\n  'compileSdk',\n  'buildTools',\n  'minSdk',\n  'targetSdk',\n  'kotlin',\n  'sourceCompatibility',\n  'targetCompatibility',\n  'jvmTarget'\n];\n\nconst gradleLog = logger.getLogger('Gradle');\n\nfunction buildServerSigningConfig (args) {\n  return {\n    zipAlign: true,\n    keystoreFile: args.keystoreFile,\n    keystorePassword: args.keystorePassword,\n    keyAlias: args.keyAlias,\n    keyPassword: args.keyPassword\n  };\n}\n\nclass ServerBuilder {\n  constructor (args = {}) {\n    this.serverPath = args.serverPath;\n    this.showGradleLog = args.showGradleLog;\n\n    const buildConfiguration = args.buildConfiguration || {};\n\n    const versionConfiguration = buildConfiguration.toolsVersions || {};\n    this.serverVersions = _.reduce(versionConfiguration, (acc, value, key) => {\n      if (VERSION_KEYS.includes(key)) {\n        acc[key] = value;\n      } else {\n        log.warn(`Got unexpected '${key}' in toolsVersion block of the build configuration`);\n      }\n      return acc;\n    }, {});\n\n    this.testAppPackage = args.testAppPackage;\n    this.signingConfig = args.signingConfig;\n\n    for (const propName of DEPENDENCY_PROP_NAMES) {\n      this[propName] = buildConfiguration[propName] || [];\n    }\n  }\n\n  async build () {\n    if (this.serverVersions[GRADLE_VERSION_KEY]) {\n      await this.setGradleWrapperVersion(this.serverVersions[GRADLE_VERSION_KEY]);\n    }\n\n    await this.insertAdditionalDependencies();\n\n    await this.runBuildProcess();\n  }\n\n  getCommand () {\n    const cmd = system.isWindows() ? 'gradlew.bat' : './gradlew';\n    const buildProperty = (key, value) => value ? `-P${key}=${value}` : null;\n    let args = VERSION_KEYS\n      .filter((key) => key !== GRADLE_VERSION_KEY)\n      .map((key) => {\n        const serverVersion = this.serverVersions[key];\n        const gradleProperty = `appium${key.charAt(0).toUpperCase()}${key.slice(1)}`;\n        return buildProperty(gradleProperty, serverVersion);\n      })\n      .filter(Boolean);\n\n    if (this.signingConfig) {\n      args.push(...(\n        _.keys(this.signingConfig)\n        .map((key) => [`appium${_.upperFirst(key)}`, this.signingConfig[key]])\n        .map(([k, v]) => buildProperty(k, v))\n        .filter(Boolean)\n      ));\n    }\n\n    if (this.testAppPackage) {\n      args.push(buildProperty('appiumTargetPackage', this.testAppPackage));\n    }\n    args.push('app:assembleAndroidTest');\n\n    return {cmd, args};\n  }\n\n  async setGradleWrapperVersion (version) {\n    const propertiesPath = path.resolve(this.serverPath, 'gradle', 'wrapper', 'gradle-wrapper.properties');\n    const originalProperties = await fs.readFile(propertiesPath, 'utf8');\n    const newProperties = this.updateGradleDistUrl(originalProperties, version);\n    await fs.writeFile(propertiesPath, newProperties, 'utf8');\n  }\n\n  updateGradleDistUrl (propertiesContent, version) {\n    return propertiesContent.replace(\n      new RegExp(`^(${_.escapeRegExp(GRADLE_URL_PREFIX)}).+$`, 'gm'),\n      `$1${GRADLE_URL_TEMPLATE.replace('VERSION', version)}`\n    );\n  }\n\n  async insertAdditionalDependencies () {\n    let hasAdditionalDeps = false;\n    for (const propName of DEPENDENCY_PROP_NAMES) {\n      if (!_.isArray(this[propName])) {\n        throw new Error(`'${propName}' must be an array`);\n      }\n      if (_.isEmpty(this[propName].filter((line) => _.trim(line)))) {\n        continue;\n      }\n\n      for (const dep of this[propName]) {\n        if (/[\\s'\\\\$]/.test(dep)) {\n          throw new Error('Single quotes, dollar characters and whitespace characters' +\n            ` are disallowed in additional dependencies: ${dep}`);\n        }\n      }\n      hasAdditionalDeps = true;\n    }\n    if (!hasAdditionalDeps) {\n      return;\n    }\n\n    const buildPath = path.resolve(this.serverPath, 'app', 'build.gradle.kts');\n    let configuration = await fs.readFile(buildPath, 'utf8');\n    for (const propName of DEPENDENCY_PROP_NAMES) {\n      const prefix = propName === DEPENDENCY_PROP_NAMES[0]\n        ? 'implementation'\n        : 'androidTestImplementation';\n      const deps = this[propName]\n        .filter((line) => _.trim(line))\n        .map((line) => `${prefix}(\"${line}\")`);\n      if (_.isEmpty(deps)) {\n        continue;\n      }\n\n      log.info(`Adding the following ${propName} to build.gradle.kts: ${deps}`);\n      configuration = updateDependencyLines(configuration, propName, deps);\n    }\n    await fs.writeFile(buildPath, configuration, 'utf8');\n  }\n\n  async runBuildProcess () {\n    const {cmd, args} = this.getCommand();\n    log.debug(`Beginning build with command '${cmd} ${args.join(' ')}' ` +\n      `in directory '${this.serverPath}'`);\n    const gradlebuild = new SubProcess(cmd, args, {\n      cwd: this.serverPath,\n      stdio: ['ignore', 'pipe', 'pipe'],\n      windowsVerbatimArguments: true\n    });\n    let buildLastLines = [];\n\n    const logMsg = `Output from Gradle ${this.showGradleLog ? 'will' : 'will not'} be logged`;\n    log.debug(`${logMsg}. To change this, use 'showGradleLog' desired capability`);\n    gradlebuild.on('stream-line', (line) => {\n      if (this.showGradleLog) {\n        if (line.startsWith('[STDERR]')) {\n          gradleLog.warn(line);\n        } else {\n          gradleLog.info(line);\n        }\n      }\n      buildLastLines.push(`${EOL}${line}`);\n      if (buildLastLines.length > GRADLE_MAX_ERROR_LOG_LINES) {\n        buildLastLines = buildLastLines.slice(-GRADLE_MAX_ERROR_LOG_LINES);\n      }\n    });\n\n    try {\n      await gradlebuild.start();\n      await gradlebuild.join();\n    } catch (err) {\n      let msg = `Unable to build Espresso server - ${err.message}\\n` +\n        `Gradle error message:${EOL}${buildLastLines}`;\n      log.errorAndThrow(msg);\n    }\n  }\n}\n\nexport { ServerBuilder, VERSION_KEYS, GRADLE_URL_TEMPLATE, buildServerSigningConfig };\nexport default ServerBuilder;\n"],"file":"lib/server-builder.js","sourceRoot":"../.."}

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

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

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

@@ -4,8 +4,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion(getIntProperty("appiumCompileSdk", 30))
-    buildToolsVersion(getStringProperty("appiumBuildTools", "30.0.3"))
+    compileSdk = getIntProperty("appiumCompileSdk", 30)
+    buildToolsVersion = getStringProperty("appiumBuildTools", "30.0.3")
     defaultConfig {
         // <instrumentation android:targetPackage=""/>
         applicationId = getStringProperty("appiumTargetPackage", "io.appium.espressoserver")
@@ -13,8 +13,8 @@ android {
         testApplicationId = "io.appium.espressoserver.test"
         testHandleProfiling = false
         testFunctionalTest = false
-        minSdkVersion(getIntProperty("appiumMinSdk", 21))
-        targetSdkVersion(getIntProperty("appiumTargetSdk", 28))
+        minSdk = getIntProperty("appiumMinSdk", 21)
+        targetSdk = getIntProperty("appiumTargetSdk", 28)
         versionCode = 1
         versionName = "1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -22,7 +22,7 @@ android {
 
     buildTypes {
         getByName("debug") {
-            zipAlignEnabled(getBooleanProperty("appiumZipAlign", true))
+            isZipAlignEnabled = getBooleanProperty("appiumZipAlign", true)
         }
         getByName("release") {
             isMinifyEnabled = false
@@ -43,19 +43,19 @@ android {
     signingConfigs {
         getByName("debug") {
             findProperty("appiumKeystoreFile")?.also {
-                storeFile(File(it.toString()))
+                storeFile = File(it.toString())
             }
 
             findProperty("appiumKeystorePassword")?.also {
-                storePassword(it.toString())
+                storePassword = it.toString()
             }
 
             findProperty("appiumKeyAlias")?.also {
-                keyAlias(it.toString())
+                keyAlias = it.toString()
             }
 
             findProperty("appiumKeyPassword")?.also {
-                keyPassword(it.toString())
+                keyPassword = it.toString()
             }
         }
     }
@@ -80,7 +80,7 @@ android {
     }
 
     packagingOptions {
-        exclude("META-INF/**")
+        resources.excludes.add("META-INF/**")
     }
 }
 
@@ -140,17 +140,17 @@ tasks.withType<Test> {
 
 object Version {
     const val kotlin = "1.5.10"
-    const val espresso = "3.3.0"
-    const val testlib = "1.3.0"
-    const val mocklib = "1.7.4"
-    const val gson = "2.8.6"
+    const val espresso = "3.4.0"
+    const val testlib = "1.4.0"
+    const val mocklib = "2.0.9"
+    const val gson = "2.8.9"
     const val uia = "2.2.0"
     const val nanohttpd = "2.3.1"
-    const val annotation = "1.1.0"
-    const val mockito = "2.8.9"
+    const val annotation = "1.3.0"
+    const val mockito = "4.0.0"
     const val robolectric = "4.5.1"
-    const val junit = "4.13"
-    const val compose = "1.0.0"
+    const val junit = "4.13.2"
+    const val compose = "1.0.5"
 }
 
 fun Project.getStringProperty(name: String, default: String): String =

package/espresso-server/app/src/test/java/io/appium/espressoserver/test/helpers/KReflectionUtilsTest.kt

@@ -19,7 +19,7 @@ import kotlin.test.assertTrue
 class `KReflectionUtils Test` {
 
     @Test
-    fun `"invokeMethod" should find methods specific to parameters provided and call it`(){
+    fun `'invokeMethod' should find methods specific to parameters provided and call it`(){
         val obj = TestClass()
 
         var methodResult = ReflectionUtils.invokeInstanceMethod(obj, "plus", null, 1)
@@ -36,13 +36,13 @@ class `KReflectionUtils Test` {
     }
 
     @Test
-    fun `"invokeInstanceMethod" should extract method of an object`() {
+    fun `'invokeInstanceMethod' should extract method of an object`() {
         val methodResult = ReflectionUtils.extractMethod(TestClass::class.java, "plus", Int::class.java, Int::class.java)
         assertNotNull(methodResult)
     }
 
     @Test
-    fun `"invokeInstanceMethod" should invoke method on instance of an object`() {
+    fun `'invokeInstanceMethod' should invoke method on instance of an object`() {
         val obj = TestClass()
         val methodResult = ReflectionUtils.invokeInstanceMethod(obj, "plus", 2, 2)
         assertTrue(methodResult is Number)
@@ -56,7 +56,7 @@ class `KReflectionUtils Test` {
     }
 
     @Test
-    fun `should parse Driver Atoms "findElement"`() {
+    fun `should parse Driver Atoms 'findElement'`() {
         val findElementAtom = invokeStaticMethod(DriverAtoms::class.java,
                 "findElement", Locator.ID, "some Identifier")
         assertTrue(findElementAtom is Atom<*>)

package/espresso-server/app/src/test/java/io/appium/espressoserver/test/model/MobileClickTest.kt

@@ -15,7 +15,7 @@ import kotlin.test.assertEquals
 class `mobile clickAction test` {
 
     @Test
-    fun `should parse "MobileClickParams" and set defaults if some params not provided` () {
+    fun `should parse 'MobileClickParams' and set defaults if some params not provided` () {
         val jsonElement = JsonObject()
         val clickActionParams = MobileClickActionParams.MobileClickActionParamsDeserializer()
                 .deserialize(jsonElement, null, null)
@@ -27,7 +27,7 @@ class `mobile clickAction test` {
     }
 
     @Test
-    fun `should parse "MobileClickParams" and set values if all params provided` () {
+    fun `should parse 'MobileClickParams' and set values if all params provided` () {
         val jsonElement = JsonObject()
         jsonElement.add("inputDevice", JsonPrimitive(2))
         jsonElement.add("buttonState", JsonPrimitive("3"))

package/espresso-server/app/src/test/java/io/appium/espressoserver/test/model/MobileSwipeTest.kt

@@ -15,7 +15,7 @@ import kotlin.test.assertEquals
 class `mobile swipe test` {
 
     @Test
-    fun `should parse "MobileSwipeActionParams" with 'direction' property` () {
+    fun `should parse 'MobileSwipeActionParams' with 'direction' property` () {
         val jsonElement = JsonObject()
         jsonElement.add("direction", JsonPrimitive("DOWN"))
         val mobileSwipeActionParams = MobileSwipeActionParamsDeserializer()
@@ -24,7 +24,7 @@ class `mobile swipe test` {
     }
 
     @Test
-    fun `should parse "MobileSwipeActionParams" with 'swiper' property and use default parameters` () {
+    fun `should parse 'MobileSwipeActionParams' with 'swiper' property and use default parameters` () {
         val jsonElement = JsonObject()
         jsonElement.add("swiper", JsonPrimitive("FAST"))
         val mobileSwipeActionParams = MobileSwipeActionParamsDeserializer()
@@ -36,7 +36,7 @@ class `mobile swipe test` {
     }
 
     @Test
-    fun `should parse "MobileSwipeActionParams" with 'swiper' property plus other parameters` () {
+    fun `should parse 'MobileSwipeActionParams' with 'swiper' property plus other parameters` () {
         val jsonElement = JsonObject()
         jsonElement.add("swiper", JsonPrimitive("FAST"))
         jsonElement.add("startCoordinates", JsonPrimitive("TOP_LEFT"))

package/espresso-server/build.gradle.kts

@@ -1,11 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+
     val appiumKotlin =
         properties.getOrDefault("appiumKotlin", "1.5.10")
 
     val appiumAndroidGradlePlugin =
-        properties.getOrDefault("appiumAndroidGradlePlugin", "4.1.1")
+        properties.getOrDefault("appiumAndroidGradlePlugin", "7.0.3")
 
     repositories {
         google()

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

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/lib/driver.js

@@ -1,7 +1,8 @@
 import _ from 'lodash';
+import path from 'path';
 import { BaseDriver, errors, isErrorType, DeviceSettings} from '@appium/base-driver';
 import { EspressoRunner, TEST_APK_PKG } from './espresso-runner';
-import { fs } from '@appium/support';
+import { fs, tempDir, zip } from '@appium/support';
 import logger from './logger';
 import commands from './commands';
 import { DEFAULT_ADB_PORT } from 'appium-adb';
@@ -119,8 +120,10 @@ const CHROME_NO_PROXY = [
   ['POST', new RegExp('^/session/[^/]+/se/log')],
 ];
 
-const APP_EXTENSION = '.apk';
 
+const APK_EXT = '.apk';
+const AAB_EXT = '.aab';
+const SUPPORTED_EXTENSIONS = [APK_EXT, AAB_EXT];
 
 class EspressoDriver extends BaseDriver {
   constructor (opts = {}, shouldValidateCaps = true) {
@@ -177,12 +180,12 @@ class EspressoDriver extends BaseDriver {
 
       if (this.isChromeSession) {
         if (this.opts.app) {
-          logger.warn(`
-            'browserName' capability will be ignored.
-            Chrome browser cannot be run in Espresso sessions because Espresso automation doesn't have permission to access Chrome.
-          `);
+          logger.warn(`'browserName' capability will be ignored`);
+          logger.warn(`Chrome browser cannot be run in Espresso sessions because Espresso automation doesn't ` +
+              `have permission to access Chrome`);
         } else {
-          logger.errorAndThrow(`Chrome browser sessions cannot be run in Espresso because Espresso automation doesn't have permission to access Chrome`);
+          logger.errorAndThrow(`Chrome browser sessions cannot be run in Espresso because Espresso ` +
+            `automation doesn't have permission to access Chrome`);
         }
       }
 
@@ -191,25 +194,41 @@ class EspressoDriver extends BaseDriver {
         this.addWipeDataToAvdArgs();
       }
 
+      this.opts.systemPort = this.opts.systemPort
+        || await findAPortNotInUse(SYSTEM_PORT_RANGE[0], SYSTEM_PORT_RANGE[1]);
+      this.opts.adbPort = this.opts.adbPort || DEFAULT_ADB_PORT;
+      // get device udid for this session
+      const {udid, emPort} = await helpers.getDeviceInfoFromCaps(this.opts);
+      this.opts.udid = udid;
+      this.opts.emPort = emPort;
+      // now that we know our java version and device info, we can create our
+      // ADB instance
+      this.adb = await androidHelpers.createADB(this.opts);
+
       if (this.opts.app) {
         // find and copy, or download and unzip an app url or path
-        this.opts.app = await this.helpers.configureApp(this.opts.app, APP_EXTENSION);
-        await this.checkAppPresent();
+        this.opts.app = await this.helpers.configureApp(this.opts.app, {
+          onPostProcess: this.onPostConfigureApp.bind(this),
+          supportedExtensions: SUPPORTED_EXTENSIONS
+        });
       } else if (this.appOnDevice) {
         // the app isn't an actual app file but rather something we want to
         // assume is on the device and just launch via the appPackage
         logger.info(`App file was not listed, instead we're going to run ` +
             `${this.opts.appPackage} directly on the device`);
-        await this.checkPackagePresent();
+        if (!await this.adb.isAppInstalled(this.opts.appPackage)) {
+          logger.errorAndThrow(`Could not find the package '${this.opts.appPackage}' ` +
+            `installed on the device`);
+        }
       }
 
-      this.opts.systemPort = this.opts.systemPort || await findAPortNotInUse(SYSTEM_PORT_RANGE[0], SYSTEM_PORT_RANGE[1]);
-      this.opts.adbPort = this.opts.adbPort || DEFAULT_ADB_PORT;
       await this.startEspressoSession();
       return [sessionId, caps];
     } catch (e) {
       await this.deleteSession();
-      e.message += '. Check https://github.com/appium/appium-espresso-driver#troubleshooting regarding advanced session startup troubleshooting.';
+      e.message += `${_.endsWith(e.message, '.') ? '' : '.'} Check ` +
+        'https://github.com/appium/appium-espresso-driver#troubleshooting ' +
+        'regarding advanced session startup troubleshooting.';
       if (isErrorType(e, errors.SessionNotCreatedError)) {
         throw e;
       }
@@ -219,6 +238,102 @@ class EspressoDriver extends BaseDriver {
     }
   }
 
+  /**
+   * Unzip the given app path and return the first package that has SUPPORTED_EXTENSIONS
+   * in the archived file.
+   *
+   * @param {string} appPath The path to app file.
+   * @returns {string} Retuns the path to an unzipped app file path.
+   * @throws Raise an exception if the zip did not have any SUPPORTED_EXTENSIONS packages.
+   */
+  async unzipApp (appPath) {
+    const useSystemUnzipEnv = process.env.APPIUM_PREFER_SYSTEM_UNZIP;
+    const useSystemUnzip = _.isEmpty(useSystemUnzipEnv)
+      || !['0', 'false'].includes(_.toLower(useSystemUnzipEnv));
+    const tmpRoot = await tempDir.openDir();
+    await zip.extractAllTo(appPath, tmpRoot, {useSystemUnzip});
+
+    const globPattern = `**/*.+(${SUPPORTED_EXTENSIONS.map((ext) => ext.replace(/^\./, '')).join('|')})`;
+    const sortedBundleItems = (await fs.glob(globPattern, {
+      cwd: tmpRoot,
+      strict: false,
+    })).sort((a, b) => a.split(path.sep).length - b.split(path.sep).length);
+    if (sortedBundleItems.length === 0) {
+      // no expected packages in the zip
+      logger.errorAndThrow(`${this.opts.app} did not have any of '${SUPPORTED_EXTENSIONS.join(', ')}' ` +
+        `extension packages. Please make sure the provided .zip archive contains at least one valid application package.`);
+    }
+    const unzippedAppPath = path.join(tmpRoot, _.first(sortedBundleItems));
+    logger.debug(`'${unzippedAppPath}' is the unzipped file from '${appPath}'`);
+    return unzippedAppPath;
+  }
+
+  async onPostConfigureApp ({cachedAppInfo, isUrl, appPath}) {
+    const presignApp = async (appLocation) => {
+      if (this.opts.noSign) {
+        logger.info('Skipping application signing because noSign capability is set to true. ' +
+          'Having the application under test with improper signature/non-signed will cause ' +
+          'Espresso automation startup failure.');
+      } else if (!await this.adb.checkApkCert(appLocation, this.opts.appPackage)) {
+        await this.adb.sign(appLocation, this.opts.appPackage);
+      }
+    };
+
+    const hasApkExt = (appPath) => _.endsWith(_.toLower(appPath), APK_EXT);
+    const hasAabExt = (appPath) => _.endsWith(_.toLower(appPath), AAB_EXT);
+    const extractUniversalApk = async (shouldExtract, appPath) =>
+      shouldExtract ? appPath : await this.adb.extractUniversalApk(appPath);
+
+    let pathInCache = null;
+    let isResultAppPathAlreadyCached = false;
+    if (_.isPlainObject(cachedAppInfo)) {
+      const packageHash = await fs.hash(appPath);
+      if (packageHash === cachedAppInfo.packageHash && await fs.exists(cachedAppInfo.fullPath)) {
+        logger.info(`Using '${cachedAppInfo.fullPath}' which is cached from '${appPath}'`);
+        isResultAppPathAlreadyCached = true;
+        pathInCache = cachedAppInfo.fullPath;
+      }
+    }
+
+    // appPath can be .zip, .apk or .aab
+    const isApk = hasApkExt(appPath);
+    // Only local .apk files that are available in-place should not be cached
+    const shouldResultAppPathBeCached = !isApk || (isApk && isUrl);
+
+    if (!isResultAppPathAlreadyCached) {
+      if (shouldResultAppPathBeCached) {
+        // .zip, .aab or downloaded .apk
+
+        let unzippedAppPath;
+        let isUnzippedApk = false;
+        if (!(hasApkExt(appPath) || hasAabExt(appPath))) {
+          unzippedAppPath = await this.unzipApp(appPath);
+          isUnzippedApk = hasApkExt(unzippedAppPath);
+        }
+
+        // unzippedAppPath or appPath has SUPPORTED_EXTENSIONS.
+        pathInCache = unzippedAppPath
+          ? await extractUniversalApk(isUnzippedApk, unzippedAppPath)
+          : await extractUniversalApk(isApk, appPath);
+
+        if (!isApk && isUrl) {
+          // Clean up the temporarily downloaded .aab or .zip package
+          await fs.rimraf(appPath);
+        }
+        if (hasAabExt(unzippedAppPath)) {
+          // Cleanup the local unzipped .aab file
+          await fs.rimraf(unzippedAppPath);
+        }
+        await presignApp(pathInCache);
+      } else if (isApk) {
+        // It is probably not the best idea to modify the provided app in-place,
+        // but this is how it was always working
+        await presignApp(appPath);
+      }
+    }
+    return shouldResultAppPathBeCached ? {appPath: pathInCache} : false;
+  }
+
   get driverData () {
     // TODO fille out resource info here
     return {};
@@ -257,15 +372,6 @@ class EspressoDriver extends BaseDriver {
   async startEspressoSession () {
     logger.info(`EspressoDriver version: ${version}`);
 
-    // get device udid for this session
-    let {udid, emPort} = await helpers.getDeviceInfoFromCaps(this.opts);
-    this.opts.udid = udid;
-    this.opts.emPort = emPort;
-
-    // now that we know our java version and device info, we can create our
-    // ADB instance
-    this.adb = await androidHelpers.createADB(this.opts);
-
     // Read https://github.com/appium/appium-android-driver/pull/461 what happens if ther is no setHiddenApiPolicy for Android P+
     if (await this.adb.getApiLevel() >= 28) { // Android P
       logger.warn('Relaxing hidden api policy');
@@ -438,13 +544,6 @@ class EspressoDriver extends BaseDriver {
       await this.adb.uninstallApk(this.opts.appPackage);
     }
     if (this.opts.app) {
-      if (this.opts.noSign) {
-        logger.info('Skipping application signing because noSign capability is set to true. ' +
-          'Having the application under test with improper signature/non-signed will cause ' +
-          'Espresso automation startup failure.');
-      } else if (!await this.adb.checkApkCert(this.opts.app, this.opts.appPackage)) {
-        await this.adb.sign(this.opts.app, this.opts.appPackage);
-      }
       await helpers.installApk(this.adb, this.opts);
     }
     if (this.opts.skipServerInstallation) {
@@ -525,14 +624,6 @@ class EspressoDriver extends BaseDriver {
     }
   }
 
-  // TODO method is duplicated from uiautomator2
-  async checkAppPresent () {
-    logger.debug('Checking whether app is actually present');
-    if (!(await fs.exists(this.opts.app))) {
-      logger.errorAndThrow(`Could not find app apk at '${this.opts.app}'`);
-    }
-  }
-
   async onSettingsUpdate () {
     // intentionally do nothing here, since commands.updateSettings proxies
     // settings to the espresso server already
@@ -567,6 +658,10 @@ class EspressoDriver extends BaseDriver {
   get isChromeSession () {
     return helpers.isChromeBrowser(this.opts.browserName);
   }
+
+  get appOnDevice () {
+    return !this.opts.app && this.helpers.isPackageOrBundle(this.opts.appPackage);
+  }
 }
 
 // first add the android-driver commands which we will fall back to

package/lib/server-builder.js

@@ -22,7 +22,7 @@ const VERSION_KEYS = [
   'kotlin',
   'sourceCompatibility',
   'targetCompatibility',
-  'jvmTarget',
+  'jvmTarget'
 ];
 
 const gradleLog = logger.getLogger('Gradle');
@@ -163,6 +163,7 @@ class ServerBuilder {
     const gradlebuild = new SubProcess(cmd, args, {
       cwd: this.serverPath,
       stdio: ['ignore', 'pipe', 'pipe'],
+      windowsVerbatimArguments: true
     });
     let buildLastLines = [];