appium-espresso-driver 2.3.0 → 2.6.0

package/build/lib/server-builder.js

@@ -13,7 +13,7 @@ require("source-map-support/register");
 
 var _teen_process = require("teen_process");
 
-var _support = require("@appium/support");
+var _support = require("appium/support");
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
@@ -29,7 +29,7 @@ const GRADLE_URL_TEMPLATE = 'https\\://services.gradle.org/distributions/gradle-
 exports.GRADLE_URL_TEMPLATE = GRADLE_URL_TEMPLATE;
 const GRADLE_MAX_ERROR_LOG_LINES = 15;
 const DEPENDENCY_PROP_NAMES = ['additionalAppDependencies', 'additionalAndroidTestDependencies'];
-const VERSION_KEYS = [GRADLE_VERSION_KEY, 'androidGradlePlugin', 'compileSdk', 'buildTools', 'minSdk', 'targetSdk', 'kotlin', 'sourceCompatibility', 'targetCompatibility', 'jvmTarget', 'composeVersion'];
+const VERSION_KEYS = [GRADLE_VERSION_KEY, 'androidGradlePlugin', 'compileSdk', 'buildTools', 'minSdk', 'targetSdk', 'kotlin', 'sourceCompatibility', 'targetCompatibility', 'jvmTarget', 'composeVersion', 'annotationVersion'];
 exports.VERSION_KEYS = VERSION_KEYS;
 
 function buildServerSigningConfig(args) {
@@ -203,4 +203,4 @@ var _default = ServerBuilder;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"file":"lib/server-builder.js","names":["GRADLE_VERSION_KEY","GRADLE_URL_PREFIX","GRADLE_URL_TEMPLATE","GRADLE_MAX_ERROR_LOG_LINES","DEPENDENCY_PROP_NAMES","VERSION_KEYS","buildServerSigningConfig","args","zipAlign","keystoreFile","keystorePassword","keyAlias","keyPassword","ServerBuilder","constructor","log","serverPath","showGradleLog","buildConfiguration","versionConfiguration","toolsVersions","serverVersions","_","reduce","acc","value","key","includes","warn","testAppPackage","signingConfig","propName","build","setGradleWrapperVersion","insertAdditionalDependencies","runBuildProcess","getCommand","cmd","system","isWindows","path","resolve","buildProperty","filter","map","serverVersion","gradleProperty","charAt","toUpperCase","slice","Boolean","push","keys","upperFirst","k","v","version","propertiesPath","originalProperties","fs","readFile","newProperties","updateGradleDistUrl","writeFile","propertiesContent","replace","RegExp","escapeRegExp","hasAdditionalDeps","isArray","Error","isEmpty","line","trim","dep","test","buildPath","configuration","prefix","deps","info","updateDependencyLines","debug","join","gradlebuild","SubProcess","cwd","stdio","windowsVerbatimArguments","buildLastLines","logMsg","on","startsWith","EOL","length","start","err","msg","message","errorAndThrow"],"sourceRoot":"../..","sources":["lib/server-builder.js"],"sourcesContent":["import { SubProcess } from 'teen_process';\nimport { fs, system } from '@appium/support';\nimport _ from 'lodash';\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  'composeVersion'\n];\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 (log, args = {}) {\n    this.log = log;\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' : path.resolve(this.serverPath, '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      this.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    this.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    this.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          this.log.warn(`[Gradle] ${line}`);\n        } else {\n          this.log.info(`[Gradle] ${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      this.log.errorAndThrow(msg);\n    }\n  }\n}\n\nexport { ServerBuilder, VERSION_KEYS, GRADLE_URL_TEMPLATE, buildServerSigningConfig };\nexport default ServerBuilder;\n"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"file":"lib/server-builder.js","names":["GRADLE_VERSION_KEY","GRADLE_URL_PREFIX","GRADLE_URL_TEMPLATE","GRADLE_MAX_ERROR_LOG_LINES","DEPENDENCY_PROP_NAMES","VERSION_KEYS","buildServerSigningConfig","args","zipAlign","keystoreFile","keystorePassword","keyAlias","keyPassword","ServerBuilder","constructor","log","serverPath","showGradleLog","buildConfiguration","versionConfiguration","toolsVersions","serverVersions","_","reduce","acc","value","key","includes","warn","testAppPackage","signingConfig","propName","build","setGradleWrapperVersion","insertAdditionalDependencies","runBuildProcess","getCommand","cmd","system","isWindows","path","resolve","buildProperty","filter","map","serverVersion","gradleProperty","charAt","toUpperCase","slice","Boolean","push","keys","upperFirst","k","v","version","propertiesPath","originalProperties","fs","readFile","newProperties","updateGradleDistUrl","writeFile","propertiesContent","replace","RegExp","escapeRegExp","hasAdditionalDeps","isArray","Error","isEmpty","line","trim","dep","test","buildPath","configuration","prefix","deps","info","updateDependencyLines","debug","join","gradlebuild","SubProcess","cwd","stdio","windowsVerbatimArguments","buildLastLines","logMsg","on","startsWith","EOL","length","start","err","msg","message","errorAndThrow"],"sourceRoot":"../..","sources":["lib/server-builder.js"],"sourcesContent":["import { SubProcess } from 'teen_process';\nimport { fs, system } from 'appium/support';\nimport _ from 'lodash';\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  'composeVersion',\n  'annotationVersion'\n];\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 (log, args = {}) {\n    this.log = log;\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' : path.resolve(this.serverPath, '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      this.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    this.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    this.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          this.log.warn(`[Gradle] ${line}`);\n        } else {\n          this.log.info(`[Gradle] ${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      this.log.errorAndThrow(msg);\n    }\n  }\n}\n\nexport { ServerBuilder, VERSION_KEYS, GRADLE_URL_TEMPLATE, buildServerSigningConfig };\nexport default ServerBuilder;\n"],"mappings":"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"}

package/build/lib/utils.js

@@ -12,7 +12,7 @@ exports.updateDependencyLines = updateDependencyLines;
 
 require("source-map-support/register");
 
-var _support = require("@appium/support");
+var _support = require("appium/support");
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
@@ -82,4 +82,4 @@ function updateDependencyLines(originalContent, dependencyPlaceholder, dependenc
 }require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliL3V0aWxzLmpzIiwibmFtZXMiOlsicXVhbGlmeUFjdGl2aXR5TmFtZSIsImFjdGl2aXR5TmFtZSIsInBhY2thZ2VOYW1lIiwic29tZSIsIm5hbWUiLCJfIiwiaW5jbHVkZXMiLCJkb3RQb3MiLCJpbmRleE9mIiwiY29weUdyYWRsZVByb2plY3RSZWN1cnNpdmVseSIsInNvdXJjZUJhc2VEaXIiLCJ0YXJnZXRCYXNlRGlyIiwiZnMiLCJ3YWxrRGlyIiwiaXRlbVBhdGgiLCJpc0RpcmVjdG9yeSIsInJlbGF0aXZlUGF0aCIsInBhdGgiLCJyZWxhdGl2ZSIsInRhcmdldFBhdGgiLCJyZXNvbHZlIiwiaXNJbkdyYWRsZUJ1aWxkRGlyIiwic2VwIiwibWtkaXJwIiwiY29weUZpbGUiLCJyZXF1aXJlT3B0aW9ucyIsIm9wdHMiLCJyZXF1aXJlZEtleXMiLCJtaXNzaW5nS2V5cyIsImRpZmZlcmVuY2UiLCJrZXlzIiwiaXNFbXB0eSIsIkVycm9yIiwidXBkYXRlRGVwZW5kZW5jeUxpbmVzIiwib3JpZ2luYWxDb250ZW50IiwiZGVwZW5kZW5jeVBsYWNlaG9sZGVyIiwiZGVwZW5kZW5jeUxpbmVzIiwiY29uZmlndXJhdGlvbkxpbmVzIiwic3BsaXQiLCJzZWFyY2hSZSIsIlJlZ0V4cCIsImVzY2FwZVJlZ0V4cCIsInBsYWNlaG9sZGVySW5kZXgiLCJmaW5kSW5kZXgiLCJsaW5lIiwidGVzdCIsInBsYWNlaG9sZGVyTGluZSIsImluZGVudExlbiIsImxlbmd0aCIsInRyaW1TdGFydCIsInNwbGljZSIsIm1hcCIsInJlcGVhdCIsImpvaW4iXSwic291cmNlUm9vdCI6Ii4uLy4uIiwic291cmNlcyI6WyJsaWIvdXRpbHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZnMsIG1rZGlycCB9IGZyb20gJ0BhcHBpdW0vc3VwcG9ydCc7XG5pbXBvcnQgXyBmcm9tICdsb2Rhc2gnO1xuaW1wb3J0IHBhdGggZnJvbSAncGF0aCc7XG5cbi8qKlxuICogaHR0cHM6Ly9hbmRyb2lkLmdvb2dsZXNvdXJjZS5jb20vcGxhdGZvcm0vZnJhbWV3b3Jrcy9iYXNlLysvbWFzdGVyL3Rvb2xzL2FhcHQvUmVzb3VyY2UuY3BwIzc1NVxuICpcbiAqIEBwYXJhbSB7c3RyaW5nfSBhY3Rpdml0eU5hbWVcbiAqIEBwYXJhbSB7c3RyaW5nfSBwYWNrYWdlTmFtZVxuICogQHJldHVybnMge3N0cmluZ30gVGhlIHF1YWxpZmllZCBhY3Rpdml0eSBuYW1lXG4gKi9cbmZ1bmN0aW9uIHF1YWxpZnlBY3Rpdml0eU5hbWUgKGFjdGl2aXR5TmFtZSwgcGFja2FnZU5hbWUpIHtcbiAgLy8gaWYgZWl0aGVyIGFjdGl2aXR5IG9yIHBhY2thZ2UgbmFtZSBpcyBub3Qgc2V0XG4gIC8vIG9yIGFueSBvZiB0aGVzZSBjb250YWluIHdpbGRjYXJkcyB0aGVuIHRoZXJlIGlzXG4gIC8vIG5vIHBvaW50IGluIHF1YWxpZnlpbmcgdGhlIGFjdGl2aXR5IG5hbWVcbiAgaWYgKFthY3Rpdml0eU5hbWUsIHBhY2thZ2VOYW1lXS5zb21lKChuYW1lKSA9PiAhbmFtZSB8fCBfLmluY2x1ZGVzKG5hbWUsICcqJykpKSB7XG4gICAgcmV0dXJuIGFjdGl2aXR5TmFtZTtcbiAgfVxuXG4gIGNvbnN0IGRvdFBvcyA9IGFjdGl2aXR5TmFtZS5pbmRleE9mKCcuJyk7XG4gIGlmIChkb3RQb3MgPiAwKSB7XG4gICAgcmV0dXJuIGFjdGl2aXR5TmFtZTtcbiAgfVxuICByZXR1cm4gYCR7cGFja2FnZU5hbWV9JHtkb3RQb3MgPT09IDAgPyAnJyA6ICcuJ30ke2FjdGl2aXR5TmFtZX1gO1xufVxuXG4vKipcbiAqIFJlY3Vyc2l2ZWx5IGNvcHkgYWxsIGZpbGVzIGV4Y2VwdCBidWlsZCBkaXJlY3RvcmllcyBjb250ZW50c1xuICogQHBhcmFtIHNvdXJjZUJhc2VEaXIge3N0cmluZ30gZGlyZWN0b3J5IHRvIGNvcHkgZmlsZXMgZnJvbVxuICogQHBhcmFtIHRhcmdldEJhc2VEaXIge3N0cmluZ30gZGlyZWN0b3J5IHRvIGNvcHkgZmlsZXMgdG9cbiAqL1xuYXN5bmMgZnVuY3Rpb24gY29weUdyYWRsZVByb2plY3RSZWN1cnNpdmVseSAoc291cmNlQmFzZURpciwgdGFyZ2V0QmFzZURpcikge1xuICBhd2FpdCBmcy53YWxrRGlyKHNvdXJjZUJhc2VEaXIsIHRydWUsIGFzeW5jIChpdGVtUGF0aCwgaXNEaXJlY3RvcnkpID0+IHtcbiAgICBjb25zdCByZWxhdGl2ZVBhdGggPSBwYXRoLnJlbGF0aXZlKHNvdXJjZUJhc2VEaXIsIGl0ZW1QYXRoKTtcbiAgICBjb25zdCB0YXJnZXRQYXRoID0gcGF0aC5yZXNvbHZlKHRhcmdldEJhc2VEaXIsIHJlbGF0aXZlUGF0aCk7XG5cbiAgICBjb25zdCBpc0luR3JhZGxlQnVpbGREaXIgPSBgJHtwYXRoLnNlcH0ke2l0ZW1QYXRofWAuaW5jbHVkZXMoYCR7cGF0aC5zZXB9YnVpbGQke3BhdGguc2VwfWApO1xuICAgIGlmIChpc0luR3JhZGxlQnVpbGREaXIpIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG5cbiAgICBpZiAoaXNEaXJlY3RvcnkpIHtcbiAgICAgIGF3YWl0IG1rZGlycCh0YXJnZXRQYXRoKTtcbiAgICB9IGVsc2Uge1xuICAgICAgYXdhaXQgZnMuY29weUZpbGUoaXRlbVBhdGgsIHRhcmdldFBhdGgpO1xuICAgIH1cbiAgICByZXR1cm4gZmFsc2U7XG4gIH0pO1xufVxuXG5mdW5jdGlvbiByZXF1aXJlT3B0aW9ucyAob3B0cywgcmVxdWlyZWRLZXlzID0gW10pIHtcbiAgY29uc3QgbWlzc2luZ0tleXMgPSBfLmRpZmZlcmVuY2UocmVxdWlyZWRLZXlzLCBfLmtleXMob3B0cykpO1xuICBpZiAoIV8uaXNFbXB0eShtaXNzaW5nS2V5cykpIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoYFRoZSBmb2xsb3dpbmcgb3B0aW9ucyBhcmUgcmVxdWlyZWQ6ICR7bWlzc2luZ0tleXN9YCk7XG4gIH1cbiAgcmV0dXJuIG9wdHM7XG59XG5cbmZ1bmN0aW9uIHVwZGF0ZURlcGVuZGVuY3lMaW5lcyAob3JpZ2luYWxDb250ZW50LCBkZXBlbmRlbmN5UGxhY2Vob2xkZXIsIGRlcGVuZGVuY3lMaW5lcykge1xuICBjb25zdCBjb25maWd1cmF0aW9uTGluZXMgPSBvcmlnaW5hbENvbnRlbnQuc3BsaXQoJ1xcbicpO1xuICBjb25zdCBzZWFyY2hSZSA9IG5ldyBSZWdFeHAoYF5cXFxccyovL1xcXFxzKlxcXFxiJHtfLmVzY2FwZVJlZ0V4cChkZXBlbmRlbmN5UGxhY2Vob2xkZXIpfVxcXFxiYCwgJ20nKTtcbiAgY29uc3QgcGxhY2Vob2xkZXJJbmRleCA9IGNvbmZpZ3VyYXRpb25MaW5lcy5maW5kSW5kZXgoKGxpbmUpID0+IHNlYXJjaFJlLnRlc3QobGluZSkpO1xuICBpZiAocGxhY2Vob2xkZXJJbmRleCA8IDApIHtcbiAgICByZXR1cm4gb3JpZ2luYWxDb250ZW50O1xuICB9XG5cbiAgY29uc3QgcGxhY2Vob2xkZXJMaW5lID0gY29uZmlndXJhdGlvbkxpbmVzW3BsYWNlaG9sZGVySW5kZXhdO1xuICBjb25zdCBpbmRlbnRMZW4gPSBwbGFjZWhvbGRlckxpbmUubGVuZ3RoIC0gXy50cmltU3RhcnQocGxhY2Vob2xkZXJMaW5lKS5sZW5ndGg7XG4gIGNvbmZpZ3VyYXRpb25MaW5lcy5zcGxpY2UocGxhY2Vob2xkZXJJbmRleCArIDEsIDAsIC4uLihkZXBlbmRlbmN5TGluZXNcbiAgICAubWFwKChsaW5lKSA9PiBgJHsnICcucmVwZWF0KGluZGVudExlbil9JHtsaW5lfWApKSk7XG4gIHJldHVybiBjb25maWd1cmF0aW9uTGluZXMuam9pbignXFxuJyk7XG59XG5cbmV4cG9ydCB7IHF1YWxpZnlBY3Rpdml0eU5hbWUsIGNvcHlHcmFkbGVQcm9qZWN0UmVjdXJzaXZlbHksIHJlcXVpcmVPcHRpb25zLCB1cGRhdGVEZXBlbmRlbmN5TGluZXMgfTtcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFTQSxTQUFTQSxtQkFBVCxDQUE4QkMsWUFBOUIsRUFBNENDLFdB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
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliL3V0aWxzLmpzIiwibmFtZXMiOlsicXVhbGlmeUFjdGl2aXR5TmFtZSIsImFjdGl2aXR5TmFtZSIsInBhY2thZ2VOYW1lIiwic29tZSIsIm5hbWUiLCJfIiwiaW5jbHVkZXMiLCJkb3RQb3MiLCJpbmRleE9mIiwiY29weUdyYWRsZVByb2plY3RSZWN1cnNpdmVseSIsInNvdXJjZUJhc2VEaXIiLCJ0YXJnZXRCYXNlRGlyIiwiZnMiLCJ3YWxrRGlyIiwiaXRlbVBhdGgiLCJpc0RpcmVjdG9yeSIsInJlbGF0aXZlUGF0aCIsInBhdGgiLCJyZWxhdGl2ZSIsInRhcmdldFBhdGgiLCJyZXNvbHZlIiwiaXNJbkdyYWRsZUJ1aWxkRGlyIiwic2VwIiwibWtkaXJwIiwiY29weUZpbGUiLCJyZXF1aXJlT3B0aW9ucyIsIm9wdHMiLCJyZXF1aXJlZEtleXMiLCJtaXNzaW5nS2V5cyIsImRpZmZlcmVuY2UiLCJrZXlzIiwiaXNFbXB0eSIsIkVycm9yIiwidXBkYXRlRGVwZW5kZW5jeUxpbmVzIiwib3JpZ2luYWxDb250ZW50IiwiZGVwZW5kZW5jeVBsYWNlaG9sZGVyIiwiZGVwZW5kZW5jeUxpbmVzIiwiY29uZmlndXJhdGlvbkxpbmVzIiwic3BsaXQiLCJzZWFyY2hSZSIsIlJlZ0V4cCIsImVzY2FwZVJlZ0V4cCIsInBsYWNlaG9sZGVySW5kZXgiLCJmaW5kSW5kZXgiLCJsaW5lIiwidGVzdCIsInBsYWNlaG9sZGVyTGluZSIsImluZGVudExlbiIsImxlbmd0aCIsInRyaW1TdGFydCIsInNwbGljZSIsIm1hcCIsInJlcGVhdCIsImpvaW4iXSwic291cmNlUm9vdCI6Ii4uLy4uIiwic291cmNlcyI6WyJsaWIvdXRpbHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZnMsIG1rZGlycCB9IGZyb20gJ2FwcGl1bS9zdXBwb3J0JztcbmltcG9ydCBfIGZyb20gJ2xvZGFzaCc7XG5pbXBvcnQgcGF0aCBmcm9tICdwYXRoJztcblxuLyoqXG4gKiBodHRwczovL2FuZHJvaWQuZ29vZ2xlc291cmNlLmNvbS9wbGF0Zm9ybS9mcmFtZXdvcmtzL2Jhc2UvKy9tYXN0ZXIvdG9vbHMvYWFwdC9SZXNvdXJjZS5jcHAjNzU1XG4gKlxuICogQHBhcmFtIHtzdHJpbmd9IGFjdGl2aXR5TmFtZVxuICogQHBhcmFtIHtzdHJpbmd9IHBhY2thZ2VOYW1lXG4gKiBAcmV0dXJucyB7c3RyaW5nfSBUaGUgcXVhbGlmaWVkIGFjdGl2aXR5IG5hbWVcbiAqL1xuZnVuY3Rpb24gcXVhbGlmeUFjdGl2aXR5TmFtZSAoYWN0aXZpdHlOYW1lLCBwYWNrYWdlTmFtZSkge1xuICAvLyBpZiBlaXRoZXIgYWN0aXZpdHkgb3IgcGFja2FnZSBuYW1lIGlzIG5vdCBzZXRcbiAgLy8gb3IgYW55IG9mIHRoZXNlIGNvbnRhaW4gd2lsZGNhcmRzIHRoZW4gdGhlcmUgaXNcbiAgLy8gbm8gcG9pbnQgaW4gcXVhbGlmeWluZyB0aGUgYWN0aXZpdHkgbmFtZVxuICBpZiAoW2FjdGl2aXR5TmFtZSwgcGFja2FnZU5hbWVdLnNvbWUoKG5hbWUpID0+ICFuYW1lIHx8IF8uaW5jbHVkZXMobmFtZSwgJyonKSkpIHtcbiAgICByZXR1cm4gYWN0aXZpdHlOYW1lO1xuICB9XG5cbiAgY29uc3QgZG90UG9zID0gYWN0aXZpdHlOYW1lLmluZGV4T2YoJy4nKTtcbiAgaWYgKGRvdFBvcyA+IDApIHtcbiAgICByZXR1cm4gYWN0aXZpdHlOYW1lO1xuICB9XG4gIHJldHVybiBgJHtwYWNrYWdlTmFtZX0ke2RvdFBvcyA9PT0gMCA/ICcnIDogJy4nfSR7YWN0aXZpdHlOYW1lfWA7XG59XG5cbi8qKlxuICogUmVjdXJzaXZlbHkgY29weSBhbGwgZmlsZXMgZXhjZXB0IGJ1aWxkIGRpcmVjdG9yaWVzIGNvbnRlbnRzXG4gKiBAcGFyYW0gc291cmNlQmFzZURpciB7c3RyaW5nfSBkaXJlY3RvcnkgdG8gY29weSBmaWxlcyBmcm9tXG4gKiBAcGFyYW0gdGFyZ2V0QmFzZURpciB7c3RyaW5nfSBkaXJlY3RvcnkgdG8gY29weSBmaWxlcyB0b1xuICovXG5hc3luYyBmdW5jdGlvbiBjb3B5R3JhZGxlUHJvamVjdFJlY3Vyc2l2ZWx5IChzb3VyY2VCYXNlRGlyLCB0YXJnZXRCYXNlRGlyKSB7XG4gIGF3YWl0IGZzLndhbGtEaXIoc291cmNlQmFzZURpciwgdHJ1ZSwgYXN5bmMgKGl0ZW1QYXRoLCBpc0RpcmVjdG9yeSkgPT4ge1xuICAgIGNvbnN0IHJlbGF0aXZlUGF0aCA9IHBhdGgucmVsYXRpdmUoc291cmNlQmFzZURpciwgaXRlbVBhdGgpO1xuICAgIGNvbnN0IHRhcmdldFBhdGggPSBwYXRoLnJlc29sdmUodGFyZ2V0QmFzZURpciwgcmVsYXRpdmVQYXRoKTtcblxuICAgIGNvbnN0IGlzSW5HcmFkbGVCdWlsZERpciA9IGAke3BhdGguc2VwfSR7aXRlbVBhdGh9YC5pbmNsdWRlcyhgJHtwYXRoLnNlcH1idWlsZCR7cGF0aC5zZXB9YCk7XG4gICAgaWYgKGlzSW5HcmFkbGVCdWlsZERpcikge1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cblxuICAgIGlmIChpc0RpcmVjdG9yeSkge1xuICAgICAgYXdhaXQgbWtkaXJwKHRhcmdldFBhdGgpO1xuICAgIH0gZWxzZSB7XG4gICAgICBhd2FpdCBmcy5jb3B5RmlsZShpdGVtUGF0aCwgdGFyZ2V0UGF0aCk7XG4gICAgfVxuICAgIHJldHVybiBmYWxzZTtcbiAgfSk7XG59XG5cbmZ1bmN0aW9uIHJlcXVpcmVPcHRpb25zIChvcHRzLCByZXF1aXJlZEtleXMgPSBbXSkge1xuICBjb25zdCBtaXNzaW5nS2V5cyA9IF8uZGlmZmVyZW5jZShyZXF1aXJlZEtleXMsIF8ua2V5cyhvcHRzKSk7XG4gIGlmICghXy5pc0VtcHR5KG1pc3NpbmdLZXlzKSkge1xuICAgIHRocm93IG5ldyBFcnJvcihgVGhlIGZvbGxvd2luZyBvcHRpb25zIGFyZSByZXF1aXJlZDogJHttaXNzaW5nS2V5c31gKTtcbiAgfVxuICByZXR1cm4gb3B0cztcbn1cblxuZnVuY3Rpb24gdXBkYXRlRGVwZW5kZW5jeUxpbmVzIChvcmlnaW5hbENvbnRlbnQsIGRlcGVuZGVuY3lQbGFjZWhvbGRlciwgZGVwZW5kZW5jeUxpbmVzKSB7XG4gIGNvbnN0IGNvbmZpZ3VyYXRpb25MaW5lcyA9IG9yaWdpbmFsQ29udGVudC5zcGxpdCgnXFxuJyk7XG4gIGNvbnN0IHNlYXJjaFJlID0gbmV3IFJlZ0V4cChgXlxcXFxzKi8vXFxcXHMqXFxcXGIke18uZXNjYXBlUmVnRXhwKGRlcGVuZGVuY3lQbGFjZWhvbGRlcil9XFxcXGJgLCAnbScpO1xuICBjb25zdCBwbGFjZWhvbGRlckluZGV4ID0gY29uZmlndXJhdGlvbkxpbmVzLmZpbmRJbmRleCgobGluZSkgPT4gc2VhcmNoUmUudGVzdChsaW5lKSk7XG4gIGlmIChwbGFjZWhvbGRlckluZGV4IDwgMCkge1xuICAgIHJldHVybiBvcmlnaW5hbENvbnRlbnQ7XG4gIH1cblxuICBjb25zdCBwbGFjZWhvbGRlckxpbmUgPSBjb25maWd1cmF0aW9uTGluZXNbcGxhY2Vob2xkZXJJbmRleF07XG4gIGNvbnN0IGluZGVudExlbiA9IHBsYWNlaG9sZGVyTGluZS5sZW5ndGggLSBfLnRyaW1TdGFydChwbGFjZWhvbGRlckxpbmUpLmxlbmd0aDtcbiAgY29uZmlndXJhdGlvbkxpbmVzLnNwbGljZShwbGFjZWhvbGRlckluZGV4ICsgMSwgMCwgLi4uKGRlcGVuZGVuY3lMaW5lc1xuICAgIC5tYXAoKGxpbmUpID0+IGAkeycgJy5yZXBlYXQoaW5kZW50TGVuKX0ke2xpbmV9YCkpKTtcbiAgcmV0dXJuIGNvbmZpZ3VyYXRpb25MaW5lcy5qb2luKCdcXG4nKTtcbn1cblxuZXhwb3J0IHsgcXVhbGlmeUFjdGl2aXR5TmFtZSwgY29weUdyYWRsZVByb2plY3RSZWN1cnNpdmVseSwgcmVxdWlyZU9wdGlvbnMsIHVwZGF0ZURlcGVuZGVuY3lMaW5lcyB9O1xuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQVNBLFNBQVNBLG1CQUFULENBQThCQyxZQUE5QixFQUE0Q0MsV0FB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

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

@@ -86,6 +86,7 @@ android {
 
 val kotlinVersion = rootProject.extra["appiumKotlin"]
 val composeVersion = getStringProperty("appiumComposeVersion", Version.compose)
+val annotationVersion = getStringProperty("appiumAnnotationVersion", Version.annotation)
 
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
@@ -95,7 +96,7 @@ dependencies {
     testImplementation("org.powermock:powermock-classloading-xstream:${Version.mocklib}")
     testImplementation("org.powermock:powermock-module-junit4-rule:${Version.mocklib}")
     testImplementation("org.powermock:powermock-module-junit4:${Version.mocklib}")
-    testImplementation("androidx.annotation:annotation:${Version.annotation}")
+    testImplementation("androidx.annotation:annotation:${annotationVersion}")
     testImplementation("androidx.test.espresso:espresso-contrib:${Version.espresso}")
     testImplementation("androidx.test.espresso:espresso-core:${Version.espresso}")
     testImplementation("androidx.test.espresso:espresso-web:${Version.espresso}")
@@ -114,7 +115,7 @@ dependencies {
     testImplementation("androidx.compose.ui:ui-test:${composeVersion}")
     testImplementation("androidx.compose.ui:ui-test-junit4:${composeVersion}")
 
-    androidTestImplementation("androidx.annotation:annotation:${Version.annotation}")
+    androidTestImplementation("androidx.annotation:annotation:${annotationVersion}")
     androidTestImplementation("androidx.test.espresso:espresso-contrib:${Version.espresso}") {
         // 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
@@ -137,6 +138,15 @@ dependencies {
     // additionalAndroidTestDependencies placeholder (don't change or delete this line)
 }
 
+configurations.all {
+    resolutionStrategy.eachDependency {
+        // To avoid "androidx.annotation:annotation" version conflict.
+        if (requested.group == "androidx.annotation" && !requested.name.contains("annotation")) {
+            useVersion(annotationVersion)
+        }
+    }
+}
+
 tasks.withType<Test> {
     systemProperty("skipespressoserver", "true")
 }

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetEnabled.kt

@@ -16,15 +16,17 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
+import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
-import io.appium.espressoserver.lib.model.EspressoElement
-
 import io.appium.espressoserver.lib.model.ViewElement
+import io.appium.espressoserver.lib.model.EspressoElement
+import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetEnabled : RequestHandler<AppiumParams, Boolean> {
 
-    @Throws(AppiumException::class)
-    override fun handleInternal(params: AppiumParams): Boolean =
-            ViewElement(EspressoElement.getViewById(params.elementId)).isEnabled
+    override fun handleEspresso(params: AppiumParams): Boolean =
+        ViewElement(EspressoElement.getViewById(params.elementId)).isEnabled
+
+    override fun handleCompose(params: AppiumParams): Boolean =
+        ComposeNodeElement(getSemanticsNode(params.elementId!!)).isEnabled
 }

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetLocation.kt

@@ -16,17 +16,22 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
+import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
-import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.Location
 import io.appium.espressoserver.lib.model.ViewElement
+import io.appium.espressoserver.lib.model.EspressoElement
+import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetLocation : RequestHandler<AppiumParams, Location> {
 
-    @Throws(AppiumException::class)
-    override fun handleInternal(params: AppiumParams): Location {
+    override fun handleEspresso(params: AppiumParams): Location {
         val viewElement = ViewElement(EspressoElement.getViewById(params.elementId))
         return Location(viewElement.bounds.left, viewElement.bounds.top)
     }
+
+    override fun handleCompose(params: AppiumParams): Location {
+        val composeNodeElement = ComposeNodeElement(getSemanticsNode(params.elementId!!))
+        return Location(composeNodeElement.bounds.left, composeNodeElement.bounds.top)
+    }
 }

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetLocationInView.kt

@@ -16,18 +16,15 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
 import io.appium.espressoserver.lib.model.AppiumParams
-import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.Location
+import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.ViewElement
 
 class GetLocationInView : RequestHandler<AppiumParams, Location> {
 
-    @Throws(AppiumException::class)
-    override fun handleInternal(params: AppiumParams): Location {
-        val view = EspressoElement.getViewById(params.elementId)
-        val viewElement = ViewElement(view)
+    override fun handleEspresso(params: AppiumParams): Location {
+        val viewElement = ViewElement(EspressoElement.getViewById(params.elementId))
         return Location(viewElement.relativeLeft, viewElement.relativeTop)
     }
 }

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetName.kt

@@ -16,16 +16,21 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
+import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
-import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.ViewElement
+import io.appium.espressoserver.lib.model.EspressoElement
+import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetName : RequestHandler<AppiumParams, String?> {
 
-    @Throws(AppiumException::class)
-    override fun handleInternal(params: AppiumParams): String? {
+    override fun handleEspresso(params: AppiumParams): String? {
         val view = EspressoElement.getViewById(params.elementId)
         return ViewElement(view).contentDescription?.toString()
     }
+
+    override fun handleCompose(params: AppiumParams): String? {
+        val composeNodeElement = ComposeNodeElement(getSemanticsNode(params.elementId!!))
+        return composeNodeElement.contentDescription?.toString()
+    }
 }

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetSelected.kt

@@ -16,15 +16,18 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
+import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
+import io.appium.espressoserver.lib.model.ComposeNodeElement
 import io.appium.espressoserver.lib.model.EspressoElement
 
 import io.appium.espressoserver.lib.model.ViewElement
 
 class GetSelected : RequestHandler<AppiumParams, Boolean> {
 
-    @Throws(AppiumException::class)
-    override fun handleInternal(params: AppiumParams): Boolean =
+    override fun handleEspresso(params: AppiumParams): Boolean =
             ViewElement(EspressoElement.getViewById(params.elementId)).isSelected
+
+    override fun handleCompose(params: AppiumParams): Boolean =
+            ComposeNodeElement(getSemanticsNode(params.elementId!!)).isSelected
 }

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetSize.kt

@@ -16,17 +16,22 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
+import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
-import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.Size
 import io.appium.espressoserver.lib.model.ViewElement
+import io.appium.espressoserver.lib.model.EspressoElement
+import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetSize : RequestHandler<AppiumParams, Size> {
 
-    @Throws(AppiumException::class)
-    override fun handleInternal(params: AppiumParams): Size {
+    override fun handleEspresso(params: AppiumParams): Size {
         val bounds = ViewElement(EspressoElement.getViewById(params.elementId)).bounds
         return Size(bounds.width(), bounds.height())
     }
+
+    override fun handleCompose(params: AppiumParams): Size {
+        val bounds = ComposeNodeElement(getSemanticsNode(params.elementId!!)).bounds
+        return Size(bounds.width(), bounds.height())
+    }
 }

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/Text.kt

@@ -16,7 +16,6 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException
 import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.ComposeNodeElement

package/index.js

@@ -1,29 +1,5 @@
 // transpile:main
+import { EspressoDriver } from './lib/driver';
 
-import { asyncify } from 'asyncbox';
-import * as driver from './lib/driver';
-import * as server from './lib/server';
-
-
-const { EspressoDriver } = driver;
-const { startServer } = server;
-
-const DEFAULT_HOST = 'localhost';
-const DEFAULT_PORT = 4884;
-
-async function main () {
-  const getArgValue = (argName) => {
-    const argIndex = process.argv.indexOf(argName);
-    return argIndex > 0 ? process.argv[argIndex + 1] : null;
-  };
-  const port = parseInt(getArgValue('--port'), 10) || DEFAULT_PORT;
-  const host = getArgValue('--host') || DEFAULT_HOST;
-  return await startServer(port, host);
-}
-
-if (require.main === module) {
-  asyncify(main);
-}
-
-export { EspressoDriver, startServer };
+export { EspressoDriver };
 export default EspressoDriver;

package/lib/commands/execute.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { errors } from '@appium/base-driver';
+import { errors } from 'appium/driver';
 
 const extensions = {};
 

package/lib/commands/general.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
-import { util } from '@appium/support';
+import { util } from 'appium/support';
 import validate from 'validate.js';
-import { errors } from '@appium/base-driver';
+import { errors } from 'appium/driver';
 import { qualifyActivityName } from '../utils';
 
 const commands = {}, helpers = {}, extensions = {};

package/lib/driver.js

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import path from 'path';
-import { BaseDriver, errors, isErrorType, DeviceSettings} from '@appium/base-driver';
+import { BaseDriver, errors, isErrorType, DeviceSettings} from 'appium/driver';
 import { EspressoRunner, TEST_APK_PKG } from './espresso-runner';
-import { fs, tempDir, zip } from '@appium/support';
+import { fs, tempDir, zip } from 'appium/support';
 import commands from './commands';
 import { DEFAULT_ADB_PORT } from 'appium-adb';
 import { androidHelpers, androidCommands, SETTINGS_HELPER_PKG_ID } from 'appium-android-driver';

package/lib/espresso-runner.js

@@ -1,8 +1,8 @@
-import { JWProxy, errors } from '@appium/base-driver';
+import { JWProxy, errors } from 'appium/driver';
 import { waitForCondition } from 'asyncbox';
 import { ServerBuilder, buildServerSigningConfig } from './server-builder';
 import path from 'path';
-import { fs, util, mkdirp, timing } from '@appium/support';
+import { fs, util, mkdirp, timing } from 'appium/support';
 import { version } from '../../package.json'; // eslint-disable-line import/no-unresolved
 import B from 'bluebird';
 import _ from 'lodash';

package/lib/logger.js

@@ -1,4 +1,4 @@
-import { logger } from '@appium/support';
+import { logger } from 'appium/support';
 
 
 const log = logger.getLogger('Espresso');

package/lib/server-builder.js

@@ -1,5 +1,5 @@
 import { SubProcess } from 'teen_process';
-import { fs, system } from '@appium/support';
+import { fs, system } from 'appium/support';
 import _ from 'lodash';
 import path from 'path';
 import { EOL } from 'os';
@@ -22,7 +22,8 @@ const VERSION_KEYS = [
   'sourceCompatibility',
   'targetCompatibility',
   'jvmTarget',
-  'composeVersion'
+  'composeVersion',
+  'annotationVersion'
 ];
 
 function buildServerSigningConfig (args) {

package/lib/utils.js

@@ -1,4 +1,4 @@
-import { fs, mkdirp } from '@appium/support';
+import { fs, mkdirp } from 'appium/support';
 import _ from 'lodash';
 import path from 'path';
 

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "2.3.0",
+  "version": "2.6.0",
   "author": "appium",
   "license": "Apache-2.0",
   "repository": {
@@ -49,8 +49,6 @@
     "!.DS_Store"
   ],
   "dependencies": {
-    "@appium/base-driver": "^8.5.2",
-    "@appium/support": "^2.58.0",
     "@babel/runtime": "^7.4.3",
     "appium-adb": "^9.1.0",
     "appium-android-driver": "^5.0.0",
@@ -83,11 +81,16 @@
     "precommit-msg",
     "precommit-test"
   ],
+  "peerDependencies": {
+    "appium": "^2.0.0-beta.40"
+  },
   "devDependencies": {
     "@appium/gulp-plugins": "^7.0.0",
     "@appium/eslint-config-appium": "^6.0.0",
     "@semantic-release/git": "^10.0.1",
     "@xmldom/xmldom": "^0.x",
+    "appium": "^2.0.0-beta.40",
+    "appium-espresso-driver": "file:.",
     "android-apidemos": "^4.0.0",
     "appium-chromedriver": "^5.0.0",
     "async-lock": "^1.0.0",

package/build/lib/server.js

@@ -1,39 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-exports.startServer = startServer;
-
-require("source-map-support/register");
-
-var _logger = _interopRequireDefault(require("./logger"));
-
-var _baseDriver = require("@appium/base-driver");
-
-var _driver = _interopRequireDefault(require("./driver"));
-
-async function startServer(port, host) {
-  const d = new _driver.default({
-    port,
-    host
-  });
-  const server = (0, _baseDriver.server)({
-    routeConfiguringFunction: (0, _baseDriver.routeConfiguringFunction)(d),
-    port,
-    hostname: host
-  });
-
-  _logger.default.info(`Android Espresso Driver listening on http://${host}:${port}`);
-
-  return await server;
-}
-
-var _default = startServer;
-exports.default = _default;require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliL3NlcnZlci5qcyIsIm5hbWVzIjpbInN0YXJ0U2VydmVyIiwicG9ydCIsImhvc3QiLCJkIiwiRXNwcmVzc29Ecml2ZXIiLCJzZXJ2ZXIiLCJiYXNlU2VydmVyIiwicm91dGVDb25maWd1cmluZ0Z1bmN0aW9uIiwiaG9zdG5hbWUiLCJsb2ciLCJpbmZvIl0sInNvdXJjZVJvb3QiOiIuLi8uLiIsInNvdXJjZXMiOlsibGliL3NlcnZlci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgbG9nIGZyb20gJy4vbG9nZ2VyJztcbmltcG9ydCB7IHNlcnZlciBhcyBiYXNlU2VydmVyLCByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24gfSBmcm9tICdAYXBwaXVtL2Jhc2UtZHJpdmVyJztcbmltcG9ydCBFc3ByZXNzb0RyaXZlciBmcm9tICcuL2RyaXZlcic7XG5cblxuYXN5bmMgZnVuY3Rpb24gc3RhcnRTZXJ2ZXIgKHBvcnQsIGhvc3QpIHtcbiAgY29uc3QgZCA9IG5ldyBFc3ByZXNzb0RyaXZlcih7cG9ydCwgaG9zdH0pO1xuICBjb25zdCBzZXJ2ZXIgPSBiYXNlU2VydmVyKHtcbiAgICByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb246IHJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbihkKSxcbiAgICBwb3J0LFxuICAgIGhvc3RuYW1lOiBob3N0LFxuICB9KTtcbiAgbG9nLmluZm8oYEFuZHJvaWQgRXNwcmVzc28gRHJpdmVyIGxpc3RlbmluZyBvbiBodHRwOi8vJHtob3N0fToke3BvcnR9YCk7XG4gIHJldHVybiBhd2FpdCBzZXJ2ZXI7XG59XG5cbmV4cG9ydCB7IHN0YXJ0U2VydmVyIH07XG5leHBvcnQgZGVmYXVsdCBzdGFydFNlcnZlcjtcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBR0EsZUFBZUEsV0FBZixDQUE0QkMsSUFBNUIsRUFBa0NDLElBQWxDLEVBQXdDO0VBQ3RDLE1BQU1DLENBQUMsR0FBRyxJQUFJQyxlQUFKLENBQW1CO0lBQUNILElBQUQ7SUFBT0M7RUFBUCxDQUFuQixDQUFWO0VBQ0EsTUFBTUcsTUFBTSxHQUFHLElBQUFDLGtCQUFBLEVBQVc7SUFDeEJDLHdCQUF3QixFQUFFLElBQUFBLG9DQUFBLEVBQXlCSixDQUF6QixDQURGO0lBRXhCRixJQUZ3QjtJQUd4Qk8sUUFBUSxFQUFFTjtFQUhjLENBQVgsQ0FBZjs7RUFLQU8sZUFBQSxDQUFJQyxJQUFKLENBQVUsK0NBQThDUixJQUFLLElBQUdELElBQUssRUFBckU7O0VBQ0EsT0FBTyxNQUFNSSxNQUFiO0FBQ0Q7O2VBR2NMLFcifQ==

package/lib/server.js

@@ -1,18 +0,0 @@
-import log from './logger';
-import { server as baseServer, routeConfiguringFunction } from '@appium/base-driver';
-import EspressoDriver from './driver';
-
-
-async function startServer (port, host) {
-  const d = new EspressoDriver({port, host});
-  const server = baseServer({
-    routeConfiguringFunction: routeConfiguringFunction(d),
-    port,
-    hostname: host,
-  });
-  log.info(`Android Espresso Driver listening on http://${host}:${port}`);
-  return await server;
-}
-
-export { startServer };
-export default startServer;