appium-espresso-driver 2.19.0 → 2.20.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/README.md +1 -0
  3. package/build/lib/server-builder.js +2 -2
  4. package/build/lib/server-builder.js.map +1 -1
  5. package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
  6. package/espresso-server/app/build.gradle.kts +6 -5
  7. package/lib/server-builder.js +1 -0
  8. package/npm-shrinkwrap.json +50 -54
  9. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ ## [2.20.1](https://github.com/appium/appium-espresso-driver/compare/v2.20.0...v2.20.1) (2023-04-10)
2
+
3
+
4
+ ### Miscellaneous Chores
5
+
6
+ * **deps-dev:** bump rimraf from 4.4.1 to 5.0.0 ([#868](https://github.com/appium/appium-espresso-driver/issues/868)) ([67cfe30](https://github.com/appium/appium-espresso-driver/commit/67cfe30e1345cbb6ede1d975213179f074aa8151))
7
+
8
+ ## [2.20.0](https://github.com/appium/appium-espresso-driver/compare/v2.19.0...v2.20.0) (2023-03-29)
9
+
10
+
11
+ ### Features
12
+
13
+ * add ability to customize espresso version ([#866](https://github.com/appium/appium-espresso-driver/issues/866)) ([8b62ecb](https://github.com/appium/appium-espresso-driver/commit/8b62ecbf2be804b3fa4a41ecfa30c3d38e3942f3))
14
+
1
15
  ## [2.19.0](https://github.com/appium/appium-espresso-driver/compare/v2.18.1...v2.19.0) (2023-03-26)
2
16
 
3
17
 
package/README.md CHANGED
@@ -247,6 +247,7 @@ minSdk | Minimum Android SDK version to compile the server for. By default the v
247
247
  targetSdk | Target Android SDK version to compile the server for. By default the version from the app [build.gradle.kts](https://github.com/appium/appium-espresso-driver/blob/master/espresso-server/app/build.gradle.kts) is used | 28
248
248
  kotlin | Kotlin version to compile the server for. By default the version from the [build.gradle.kts](https://github.com/appium/appium-espresso-driver/blob/master/espresso-server/build.gradle.kts) is used | '1.3.72'
249
249
  composeVersion | The version for the Jetpack Compose dependencies to use for Espresso server building. By default the version from the [build.gradle.kts](https://github.com/appium/appium-espresso-driver/blob/master/espresso-server/build.gradle.kts) is used | '1.1.1'
250
+ espressoVersion | The version for the Espresso dependencies to use for Espresso server building. By default the version from the [build.gradle.kts](https://github.com/appium/appium-espresso-driver/blob/master/espresso-server/build.gradle.kts) is used | '3.5.0'
250
251
  sourceCompatibility | The minimum version of JVM the project sources are compatible with. The default value is `VERSION_1_8` | VERSION_12
251
252
  targetCompatibility | The target version of JVM the project sources are compatible with. The default value is `VERSION_1_8` | VERSION_12
252
253
  jvmTarget | Target version of the generated JVM bytecode as a string. The default value is `1_8` | `1_10`
package/build/lib/server-builder.js CHANGED
@@ -20,7 +20,7 @@ const GRADLE_URL_TEMPLATE = 'https\\://services.gradle.org/distributions/gradle-
20
20
  exports.GRADLE_URL_TEMPLATE = GRADLE_URL_TEMPLATE;
21
21
  const GRADLE_MAX_ERROR_LOG_LINES = 15;
22
22
  const DEPENDENCY_PROP_NAMES = ['additionalAppDependencies', 'additionalAndroidTestDependencies'];
23
- const VERSION_KEYS = [GRADLE_VERSION_KEY, 'androidGradlePlugin', 'compileSdk', 'buildTools', 'minSdk', 'targetSdk', 'kotlin', 'sourceCompatibility', 'targetCompatibility', 'jvmTarget', 'composeVersion', 'annotationVersion'];
23
+ const VERSION_KEYS = [GRADLE_VERSION_KEY, 'androidGradlePlugin', 'compileSdk', 'buildTools', 'minSdk', 'targetSdk', 'kotlin', 'sourceCompatibility', 'targetCompatibility', 'jvmTarget', 'composeVersion', 'espressoVersion', 'annotationVersion'];
24
24
  exports.VERSION_KEYS = VERSION_KEYS;
25
25
  function buildServerSigningConfig(args) {
26
26
  return {
@@ -159,4 +159,4 @@ class ServerBuilder {
159
159
  exports.ServerBuilder = ServerBuilder;
160
160
  var _default = ServerBuilder;
161
161
  exports.default = _default;
162
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_teen_process","require","_support","_lodash","_interopRequireDefault","_path","_os","_utils","GRADLE_VERSION_KEY","GRADLE_URL_PREFIX","GRADLE_URL_TEMPLATE","exports","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","_default","default"],"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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"}
162
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_teen_process","require","_support","_lodash","_interopRequireDefault","_path","_os","_utils","GRADLE_VERSION_KEY","GRADLE_URL_PREFIX","GRADLE_URL_TEMPLATE","exports","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","_default","default"],"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  'espressoVersion',\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/server-builder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server-builder.js","names":["_teen_process","require","_support","_lodash","_interopRequireDefault","_path","_os","_utils","GRADLE_VERSION_KEY","GRADLE_URL_PREFIX","GRADLE_URL_TEMPLATE","exports","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","_default","default"],"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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"}
1
+ {"version":3,"file":"server-builder.js","names":["_teen_process","require","_support","_lodash","_interopRequireDefault","_path","_os","_utils","GRADLE_VERSION_KEY","GRADLE_URL_PREFIX","GRADLE_URL_TEMPLATE","exports","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","_default","default"],"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 'espressoVersion',\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":";;;;;;;;;;AAAA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,KAAA,GAAAD,sBAAA,CAAAH,OAAA;AACA,IAAAK,GAAA,GAAAL,OAAA;AACA,IAAAM,MAAA,GAAAN,OAAA;AAEA,MAAMO,kBAAkB,GAAG,QAAQ;AACnC,MAAMC,iBAAiB,GAAG,kBAAkB;AAC5C,MAAMC,mBAAmB,GAAG,oEAAoE;AAACC,OAAA,CAAAD,mBAAA,GAAAA,mBAAA;AACjG,MAAME,0BAA0B,GAAG,EAAE;AACrC,MAAMC,qBAAqB,GAAG,CAAC,2BAA2B,EAAE,mCAAmC,CAAC;AAEhG,MAAMC,YAAY,GAAG,CACnBN,kBAAkB,EAClB,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,qBAAqB,EACrB,qBAAqB,EACrB,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,CACpB;AAACG,OAAA,CAAAG,YAAA,GAAAA,YAAA;AAEF,SAASC,wBAAwBA,CAAEC,IAAI,EAAE;EACvC,OAAO;IACLC,QAAQ,EAAE,IAAI;IACdC,YAAY,EAAEF,IAAI,CAACE,YAAY;IAC/BC,gBAAgB,EAAEH,IAAI,CAACG,gBAAgB;IACvCC,QAAQ,EAAEJ,IAAI,CAACI,QAAQ;IACvBC,WAAW,EAAEL,IAAI,CAACK;EACpB,CAAC;AACH;AAEA,MAAMC,aAAa,CAAC;EAClBC,WAAWA,CAAEC,GAAG,EAAER,IAAI,GAAG,CAAC,CAAC,EAAE;IAC3B,IAAI,CAACQ,GAAG,GAAGA,GAAG;IACd,IAAI,CAACC,UAAU,GAAGT,IAAI,CAACS,UAAU;IACjC,IAAI,CAACC,aAAa,GAAGV,IAAI,CAACU,aAAa;IAEvC,MAAMC,kBAAkB,GAAGX,IAAI,CAACW,kBAAkB,IAAI,CAAC,CAAC;IAExD,MAAMC,oBAAoB,GAAGD,kBAAkB,CAACE,aAAa,IAAI,CAAC,CAAC;IACnE,IAAI,CAACC,cAAc,GAAGC,eAAC,CAACC,MAAM,CAACJ,oBAAoB,EAAE,CAACK,GAAG,EAAEC,KAAK,EAAEC,GAAG,KAAK;MACxE,IAAIrB,YAAY,CAACsB,QAAQ,CAACD,GAAG,CAAC,EAAE;QAC9BF,GAAG,CAACE,GAAG,CAAC,GAAGD,KAAK;MAClB,CAAC,MAAM;QACLV,GAAG,CAACa,IAAI,CAAE,mBAAkBF,GAAI,oDAAmD,CAAC;MACtF;MACA,OAAOF,GAAG;IACZ,CAAC,EAAE,CAAC,CAAC,CAAC;IAEN,IAAI,CAACK,cAAc,GAAGtB,IAAI,CAACsB,cAAc;IACzC,IAAI,CAACC,aAAa,GAAGvB,IAAI,CAACuB,aAAa;IAEvC,KAAK,MAAMC,QAAQ,IAAI3B,qBAAqB,EAAE;MAC5C,IAAI,CAAC2B,QAAQ,CAAC,GAAGb,kBAAkB,CAACa,QAAQ,CAAC,IAAI,EAAE;IACrD;EACF;EAEA,MAAMC,KAAKA,CAAA,EAAI;IACb,IAAI,IAAI,CAACX,cAAc,CAACtB,kBAAkB,CAAC,EAAE;MAC3C,MAAM,IAAI,CAACkC,uBAAuB,CAAC,IAAI,CAACZ,cAAc,CAACtB,kBAAkB,CAAC,CAAC;IAC7E;IAEA,MAAM,IAAI,CAACmC,4BAA4B,EAAE;IAEzC,MAAM,IAAI,CAACC,eAAe,EAAE;EAC9B;EAEAC,UAAUA,CAAA,EAAI;IACZ,MAAMC,GAAG,GAAGC,eAAM,CAACC,SAAS,EAAE,GAAG,aAAa,GAAGC,aAAI,CAACC,OAAO,CAAC,IAAI,CAACzB,UAAU,EAAE,SAAS,CAAC;IACzF,MAAM0B,aAAa,GAAGA,CAAChB,GAAG,EAAED,KAAK,KAAKA,KAAK,GAAI,KAAIC,GAAI,IAAGD,KAAM,EAAC,GAAG,IAAI;IACxE,IAAIlB,IAAI,GAAGF,YAAY,CACpBsC,MAAM,CAAEjB,GAAG,IAAKA,GAAG,KAAK3B,kBAAkB,CAAC,CAC3C6C,GAAG,CAAElB,GAAG,IAAK;MACZ,MAAMmB,aAAa,GAAG,IAAI,CAACxB,cAAc,CAACK,GAAG,CAAC;MAC9C,MAAMoB,cAAc,GAAI,SAAQpB,GAAG,CAACqB,MAAM,CAAC,CAAC,CAAC,CAACC,WAAW,EAAG,GAAEtB,GAAG,CAACuB,KAAK,CAAC,CAAC,CAAE,EAAC;MAC5E,OAAOP,aAAa,CAACI,cAAc,EAAED,aAAa,CAAC;IACrD,CAAC,CAAC,CACDF,MAAM,CAACO,OAAO,CAAC;IAElB,IAAI,IAAI,CAACpB,aAAa,EAAE;MACtBvB,IAAI,CAAC4C,IAAI,CAAC,GACR7B,eAAC,CAAC8B,IAAI,CAAC,IAAI,CAACtB,aAAa,CAAC,CACzBc,GAAG,CAAElB,GAAG,IAAK,CAAE,SAAQJ,eAAC,CAAC+B,UAAU,CAAC3B,GAAG,CAAE,EAAC,EAAE,IAAI,CAACI,aAAa,CAACJ,GAAG,CAAC,CAAC,CAAC,CACrEkB,GAAG,CAAC,CAAC,CAACU,CAAC,EAAEC,CAAC,CAAC,KAAKb,aAAa,CAACY,CAAC,EAAEC,CAAC,CAAC,CAAC,CACpCZ,MAAM,CAACO,OAAO,CAChB,CAAC;IACJ;IAEA,IAAI,IAAI,CAACrB,cAAc,EAAE;MACvBtB,IAAI,CAAC4C,IAAI,CAACT,aAAa,CAAC,qBAAqB,EAAE,IAAI,CAACb,cAAc,CAAC,CAAC;IACtE;IACAtB,IAAI,CAAC4C,IAAI,CAAC,yBAAyB,CAAC;IAEpC,OAAO;MAACd,GAAG;MAAE9B;IAAI,CAAC;EACpB;EAEA,MAAM0B,uBAAuBA,CAAEuB,OAAO,EAAE;IACtC,MAAMC,cAAc,GAAGjB,aAAI,CAACC,OAAO,CAAC,IAAI,CAACzB,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,2BAA2B,CAAC;IACtG,MAAM0C,kBAAkB,GAAG,MAAMC,WAAE,CAACC,QAAQ,CAACH,cAAc,EAAE,MAAM,CAAC;IACpE,MAAMI,aAAa,GAAG,IAAI,CAACC,mBAAmB,CAACJ,kBAAkB,EAAEF,OAAO,CAAC;IAC3E,MAAMG,WAAE,CAACI,SAAS,CAACN,cAAc,EAAEI,aAAa,EAAE,MAAM,CAAC;EAC3D;EAEAC,mBAAmBA,CAAEE,iBAAiB,EAAER,OAAO,EAAE;IAC/C,OAAOQ,iBAAiB,CAACC,OAAO,CAC9B,IAAIC,MAAM,CAAE,KAAI5C,eAAC,CAAC6C,YAAY,CAACnE,iBAAiB,CAAE,MAAK,EAAE,IAAI,CAAC,EAC7D,KAAIC,mBAAmB,CAACgE,OAAO,CAAC,SAAS,EAAET,OAAO,CAAE,EAAC,CACvD;EACH;EAEA,MAAMtB,4BAA4BA,CAAA,EAAI;IACpC,IAAIkC,iBAAiB,GAAG,KAAK;IAC7B,KAAK,MAAMrC,QAAQ,IAAI3B,qBAAqB,EAAE;MAC5C,IAAI,CAACkB,eAAC,CAAC+C,OAAO,CAAC,IAAI,CAACtC,QAAQ,CAAC,CAAC,EAAE;QAC9B,MAAM,IAAIuC,KAAK,CAAE,IAAGvC,QAAS,oBAAmB,CAAC;MACnD;MACA,IAAIT,eAAC,CAACiD,OAAO,CAAC,IAAI,CAACxC,QAAQ,CAAC,CAACY,MAAM,CAAE6B,IAAI,IAAKlD,eAAC,CAACmD,IAAI,CAACD,IAAI,CAAC,CAAC,CAAC,EAAE;QAC5D;MACF;MAEA,KAAK,MAAME,GAAG,IAAI,IAAI,CAAC3C,QAAQ,CAAC,EAAE;QAChC,IAAI,UAAU,CAAC4C,IAAI,CAACD,GAAG,CAAC,EAAE;UACxB,MAAM,IAAIJ,KAAK,CAAC,4DAA4D,GACzE,+CAA8CI,GAAI,EAAC,CAAC;QACzD;MACF;MACAN,iBAAiB,GAAG,IAAI;IAC1B;IACA,IAAI,CAACA,iBAAiB,EAAE;MACtB;IACF;IAEA,MAAMQ,SAAS,GAAGpC,aAAI,CAACC,OAAO,CAAC,IAAI,CAACzB,UAAU,EAAE,KAAK,EAAE,kBAAkB,CAAC;IAC1E,IAAI6D,aAAa,GAAG,MAAMlB,WAAE,CAACC,QAAQ,CAACgB,SAAS,EAAE,MAAM,CAAC;IACxD,KAAK,MAAM7C,QAAQ,IAAI3B,qBAAqB,EAAE;MAC5C,MAAM0E,MAAM,GAAG/C,QAAQ,KAAK3B,qBAAqB,CAAC,CAAC,CAAC,GAChD,gBAAgB,GAChB,2BAA2B;MAC/B,MAAM2E,IAAI,GAAG,IAAI,CAAChD,QAAQ,CAAC,CACxBY,MAAM,CAAE6B,IAAI,IAAKlD,eAAC,CAACmD,IAAI,CAACD,IAAI,CAAC,CAAC,CAC9B5B,GAAG,CAAE4B,IAAI,IAAM,GAAEM,MAAO,KAAIN,IAAK,IAAG,CAAC;MACxC,IAAIlD,eAAC,CAACiD,OAAO,CAACQ,IAAI,CAAC,EAAE;QACnB;MACF;MAEA,IAAI,CAAChE,GAAG,CAACiE,IAAI,CAAE,wBAAuBjD,QAAS,yBAAwBgD,IAAK,EAAC,CAAC;MAC9EF,aAAa,GAAG,IAAAI,4BAAqB,EAACJ,aAAa,EAAE9C,QAAQ,EAAEgD,IAAI,CAAC;IACtE;IACA,MAAMpB,WAAE,CAACI,SAAS,CAACa,SAAS,EAAEC,aAAa,EAAE,MAAM,CAAC;EACtD;EAEA,MAAM1C,eAAeA,CAAA,EAAI;IACvB,MAAM;MAACE,GAAG;MAAE9B;IAAI,CAAC,GAAG,IAAI,CAAC6B,UAAU,EAAE;IACrC,IAAI,CAACrB,GAAG,CAACmE,KAAK,CAAE,iCAAgC7C,GAAI,IAAG9B,IAAI,CAAC4E,IAAI,CAAC,GAAG,CAAE,IAAG,GACtE,iBAAgB,IAAI,CAACnE,UAAW,GAAE,CAAC;IACtC,MAAMoE,WAAW,GAAG,IAAIC,wBAAU,CAAChD,GAAG,EAAE9B,IAAI,EAAE;MAC5C+E,GAAG,EAAE,IAAI,CAACtE,UAAU;MACpBuE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;MACjCC,wBAAwB,EAAE;IAC5B,CAAC,CAAC;IACF,IAAIC,cAAc,GAAG,EAAE;IAEvB,MAAMC,MAAM,GAAI,sBAAqB,IAAI,CAACzE,aAAa,GAAG,MAAM,GAAG,UAAW,YAAW;IACzF,IAAI,CAACF,GAAG,CAACmE,KAAK,CAAE,GAAEQ,MAAO,0DAAyD,CAAC;IACnFN,WAAW,CAACO,EAAE,CAAC,aAAa,EAAGnB,IAAI,IAAK;MACtC,IAAI,IAAI,CAACvD,aAAa,EAAE;QACtB,IAAIuD,IAAI,CAACoB,UAAU,CAAC,UAAU,CAAC,EAAE;UAC/B,IAAI,CAAC7E,GAAG,CAACa,IAAI,CAAE,YAAW4C,IAAK,EAAC,CAAC;QACnC,CAAC,MAAM;UACL,IAAI,CAACzD,GAAG,CAACiE,IAAI,CAAE,YAAWR,IAAK,EAAC,CAAC;QACnC;MACF;MACAiB,cAAc,CAACtC,IAAI,CAAE,GAAE0C,OAAI,GAAErB,IAAK,EAAC,CAAC;MACpC,IAAIiB,cAAc,CAACK,MAAM,GAAG3F,0BAA0B,EAAE;QACtDsF,cAAc,GAAGA,cAAc,CAACxC,KAAK,CAAC,CAAC9C,0BAA0B,CAAC;MACpE;IACF,CAAC,CAAC;IAEF,IAAI;MACF,MAAMiF,WAAW,CAACW,KAAK,EAAE;MACzB,MAAMX,WAAW,CAACD,IAAI,EAAE;IAC1B,CAAC,CAAC,OAAOa,GAAG,EAAE;MACZ,IAAIC,GAAG,GAAI,qCAAoCD,GAAG,CAACE,OAAQ,IAAG,GAC3D,wBAAuBL,OAAI,GAAEJ,cAAe,EAAC;MAChD,IAAI,CAAC1E,GAAG,CAACoF,aAAa,CAACF,GAAG,CAAC;IAC7B;EACF;AACF;AAAC/F,OAAA,CAAAW,aAAA,GAAAA,aAAA;AAAA,IAAAuF,QAAA,GAGcvF,aAAa;AAAAX,OAAA,CAAAmG,OAAA,GAAAD,QAAA"}
package/espresso-server/app/build.gradle.kts CHANGED
@@ -86,6 +86,7 @@ android {
86
86
 
87
87
  val kotlinVersion = rootProject.extra["appiumKotlin"]
88
88
  val composeVersion = getStringProperty("appiumComposeVersion", Version.compose)
89
+ val espressoVersion = getStringProperty("appiumEspressoVersion", Version.espresso)
89
90
  val annotationVersion = getStringProperty("appiumAnnotationVersion", Version.annotation)
90
91
 
91
92
  dependencies {
@@ -97,9 +98,9 @@ dependencies {
97
98
  testImplementation("org.powermock:powermock-module-junit4-rule:${Version.mocklib}")
98
99
  testImplementation("org.powermock:powermock-module-junit4:${Version.mocklib}")
99
100
  testImplementation("androidx.annotation:annotation:${annotationVersion}")
100
- testImplementation("androidx.test.espresso:espresso-contrib:${Version.espresso}")
101
- testImplementation("androidx.test.espresso:espresso-core:${Version.espresso}")
102
- testImplementation("androidx.test.espresso:espresso-web:${Version.espresso}")
101
+ testImplementation("androidx.test.espresso:espresso-contrib:${espressoVersion}")
102
+ testImplementation("androidx.test.espresso:espresso-core:${espressoVersion}")
103
+ testImplementation("androidx.test.espresso:espresso-web:${espressoVersion}")
103
104
  testImplementation("androidx.test.uiautomator:uiautomator:${Version.uia}")
104
105
  testImplementation("androidx.test:core:${Version.testlib}")
105
106
  testImplementation("androidx.test:runner:${Version.testlib}")
@@ -116,12 +117,12 @@ dependencies {
116
117
  testImplementation("androidx.compose.ui:ui-test-junit4:${composeVersion}")
117
118
 
118
119
  androidTestImplementation("androidx.annotation:annotation:${annotationVersion}")
119
- androidTestImplementation("androidx.test.espresso:espresso-contrib:${Version.espresso}") {
120
+ androidTestImplementation("androidx.test.espresso:espresso-contrib:${espressoVersion}") {
120
121
  // Exclude transitive dependencies to limit conflicts with AndroidX libraries from AUT.
121
122
  // Link to PR with fix and discussion https://github.com/appium/appium-espresso-driver/pull/596
122
123
  isTransitive = false
123
124
  }
124
- androidTestImplementation("androidx.test.espresso:espresso-web:${Version.espresso}") {
125
+ androidTestImplementation("androidx.test.espresso:espresso-web:${espressoVersion}") {
125
126
  because("Espresso Web Atoms support (mobile: webAtoms)")
126
127
  }
127
128
  androidTestImplementation("androidx.test.uiautomator:uiautomator:${Version.uia}") {
package/lib/server-builder.js CHANGED
@@ -23,6 +23,7 @@ const VERSION_KEYS = [
23
23
  'targetCompatibility',
24
24
  'jvmTarget',
25
25
  'composeVersion',
26
+ 'espressoVersion',
26
27
  'annotationVersion'
27
28
  ];
28
29
 
package/npm-shrinkwrap.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "appium-espresso-driver",
3
- "version": "2.19.0",
3
+ "version": "2.20.1",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "appium-espresso-driver",
9
- "version": "2.19.0",
9
+ "version": "2.20.1",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
12
  "@babel/runtime": "^7.4.3",
@@ -46,7 +46,7 @@
46
46
  "lint-staged": "^13.0.3",
47
47
  "mocha": "^10.0.0",
48
48
  "pre-commit": "^1.2.2",
49
- "rimraf": "^4.0.4",
49
+ "rimraf": "^5.0.0",
50
50
  "semantic-release": "^20.0.2",
51
51
  "sinon": "^15.0.0",
52
52
  "webdriverio": "^8.0.2",
@@ -61,11 +61,11 @@
61
61
  }
62
62
  },
63
63
  "node_modules/@appium/base-driver": {
64
- "version": "9.3.3",
64
+ "version": "9.3.5",
65
65
  "license": "Apache-2.0",
66
66
  "dependencies": {
67
- "@appium/support": "^3.1.7",
68
- "@appium/types": "^0.10.1",
67
+ "@appium/support": "^3.1.9",
68
+ "@appium/types": "^0.10.3",
69
69
  "@colors/colors": "1.5.0",
70
70
  "@types/async-lock": "1.4.0",
71
71
  "@types/bluebird": "3.5.38",
@@ -86,7 +86,7 @@
86
86
  "morgan": "1.10.0",
87
87
  "serve-favicon": "2.5.0",
88
88
  "source-map-support": "0.5.21",
89
- "type-fest": "3.6.1",
89
+ "type-fest": "3.7.2",
90
90
  "validate.js": "0.13.1"
91
91
  },
92
92
  "engines": {
@@ -102,12 +102,12 @@
102
102
  }
103
103
  },
104
104
  "node_modules/@appium/base-plugin": {
105
- "version": "2.2.3",
105
+ "version": "2.2.5",
106
106
  "extraneous": true,
107
107
  "license": "Apache-2.0",
108
108
  "dependencies": {
109
- "@appium/base-driver": "^9.3.3",
110
- "@appium/support": "^3.1.7"
109
+ "@appium/base-driver": "^9.3.5",
110
+ "@appium/support": "^3.1.9"
111
111
  },
112
112
  "engines": {
113
113
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -115,13 +115,13 @@
115
115
  }
116
116
  },
117
117
  "node_modules/@appium/docutils": {
118
- "version": "0.3.0",
118
+ "version": "0.3.4",
119
119
  "extraneous": true,
120
120
  "license": "Apache-2.0",
121
121
  "dependencies": {
122
- "@appium/support": "^3.1.7",
122
+ "@appium/support": "^3.1.9",
123
123
  "@appium/tsconfig": "^0.2.4",
124
- "@appium/typedoc-plugin-appium": "^0.5.1",
124
+ "@appium/typedoc-plugin-appium": "^0.6.0",
125
125
  "@sliphua/lilconfig-ts-loader": "3.2.2",
126
126
  "chalk": "4.1.2",
127
127
  "consola": "2.15.3",
@@ -137,8 +137,8 @@
137
137
  "semver": "7.3.8",
138
138
  "source-map-support": "0.5.21",
139
139
  "teen_process": "2.0.2",
140
- "type-fest": "3.6.1",
141
- "typedoc": "0.23.26",
140
+ "type-fest": "3.7.2",
141
+ "typedoc": "0.23.28",
142
142
  "typedoc-plugin-markdown": "3.14.0",
143
143
  "typedoc-plugin-resolve-crossmodule-references": "0.3.3",
144
144
  "typescript": "4.9.5",
@@ -254,13 +254,13 @@
254
254
  }
255
255
  },
256
256
  "node_modules/@appium/support": {
257
- "version": "3.1.7",
257
+ "version": "3.1.9",
258
258
  "license": "Apache-2.0",
259
259
  "dependencies": {
260
260
  "@appium/tsconfig": "^0.2.4",
261
- "@appium/types": "^0.10.1",
261
+ "@appium/types": "^0.10.3",
262
262
  "@colors/colors": "1.5.0",
263
- "@types/archiver": "5.3.1",
263
+ "@types/archiver": "5.3.2",
264
264
  "@types/base64-stream": "1.0.2",
265
265
  "@types/find-root": "1.1.2",
266
266
  "@types/glob": "8.1.0",
@@ -311,7 +311,7 @@
311
311
  "source-map-support": "0.5.21",
312
312
  "supports-color": "8.1.1",
313
313
  "teen_process": "2.0.2",
314
- "type-fest": "3.6.1",
314
+ "type-fest": "3.7.2",
315
315
  "uuid": "9.0.0",
316
316
  "which": "3.0.0",
317
317
  "yauzl": "2.10.0"
@@ -443,14 +443,14 @@
443
443
  }
444
444
  },
445
445
  "node_modules/@appium/typedoc-plugin-appium": {
446
- "version": "0.5.1",
446
+ "version": "0.6.0",
447
447
  "extraneous": true,
448
448
  "license": "Apache-2.0",
449
449
  "dependencies": {
450
450
  "handlebars": "4.7.7",
451
451
  "lodash": "4.17.21",
452
452
  "pluralize": "8.0.0",
453
- "type-fest": "3.6.1"
453
+ "type-fest": "3.7.2"
454
454
  },
455
455
  "engines": {
456
456
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -461,11 +461,11 @@
461
461
  "typedoc": "^0.23.14",
462
462
  "typedoc-plugin-markdown": "^3.14.0",
463
463
  "typedoc-plugin-resolve-crossmodule-references": "~0.3.3",
464
- "typescript": "^4.7.0"
464
+ "typescript": "^4.7.0 || ^5.0.0"
465
465
  }
466
466
  },
467
467
  "node_modules/@appium/types": {
468
- "version": "0.10.1",
468
+ "version": "0.10.3",
469
469
  "license": "Apache-2.0",
470
470
  "dependencies": {
471
471
  "@appium/schema": "^0.2.6",
@@ -473,7 +473,7 @@
473
473
  "@types/express": "4.17.17",
474
474
  "@types/npmlog": "4.1.4",
475
475
  "@types/ws": "8.5.4",
476
- "type-fest": "3.6.1"
476
+ "type-fest": "3.7.2"
477
477
  },
478
478
  "engines": {
479
479
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -481,7 +481,7 @@
481
481
  }
482
482
  },
483
483
  "node_modules/@babel/code-frame": {
484
- "version": "7.18.6",
484
+ "version": "7.21.4",
485
485
  "license": "MIT",
486
486
  "dependencies": {
487
487
  "@babel/highlight": "^7.18.6"
@@ -998,10 +998,10 @@
998
998
  "license": "MIT"
999
999
  },
1000
1000
  "node_modules/@types/archiver": {
1001
- "version": "5.3.1",
1001
+ "version": "5.3.2",
1002
1002
  "license": "MIT",
1003
1003
  "dependencies": {
1004
- "@types/glob": "*"
1004
+ "@types/readdir-glob": "*"
1005
1005
  }
1006
1006
  },
1007
1007
  "node_modules/@types/argparse": {
@@ -1124,7 +1124,7 @@
1124
1124
  }
1125
1125
  },
1126
1126
  "node_modules/@types/node": {
1127
- "version": "18.15.10",
1127
+ "version": "18.15.11",
1128
1128
  "license": "MIT"
1129
1129
  },
1130
1130
  "node_modules/@types/normalize-package-data": {
@@ -1154,6 +1154,13 @@
1154
1154
  "version": "1.2.4",
1155
1155
  "license": "MIT"
1156
1156
  },
1157
+ "node_modules/@types/readdir-glob": {
1158
+ "version": "1.1.1",
1159
+ "license": "MIT",
1160
+ "dependencies": {
1161
+ "@types/node": "*"
1162
+ }
1163
+ },
1157
1164
  "node_modules/@types/rimraf": {
1158
1165
  "version": "3.0.2",
1159
1166
  "license": "MIT",
@@ -1218,7 +1225,7 @@
1218
1225
  }
1219
1226
  },
1220
1227
  "node_modules/@xmldom/xmldom": {
1221
- "version": "0.8.6",
1228
+ "version": "0.8.7",
1222
1229
  "license": "MIT",
1223
1230
  "engines": {
1224
1231
  "node": ">=10.0.0"
@@ -1322,7 +1329,7 @@
1322
1329
  "license": "MIT"
1323
1330
  },
1324
1331
  "node_modules/appium-adb": {
1325
- "version": "9.10.24",
1332
+ "version": "9.11.0",
1326
1333
  "license": "Apache-2.0",
1327
1334
  "dependencies": {
1328
1335
  "@appium/support": "^3.0.0",
@@ -1379,11 +1386,11 @@
1379
1386
  "license": "ISC"
1380
1387
  },
1381
1388
  "node_modules/appium-android-driver": {
1382
- "version": "5.8.12",
1389
+ "version": "5.9.0",
1383
1390
  "license": "Apache-2.0",
1384
1391
  "dependencies": {
1385
1392
  "@babel/runtime": "^7.0.0",
1386
- "appium-adb": "^9.10.9",
1393
+ "appium-adb": "^9.11.0",
1387
1394
  "appium-chromedriver": "^5.2.0",
1388
1395
  "asyncbox": "^2.8.0",
1389
1396
  "axios": "^1.x",
@@ -1445,7 +1452,7 @@
1445
1452
  "license": "ISC"
1446
1453
  },
1447
1454
  "node_modules/appium-chromedriver": {
1448
- "version": "5.3.2",
1455
+ "version": "5.3.4",
1449
1456
  "hasInstallScript": true,
1450
1457
  "license": "Apache-2.0",
1451
1458
  "dependencies": {
@@ -1879,7 +1886,7 @@
1879
1886
  }
1880
1887
  },
1881
1888
  "node_modules/cli-spinners": {
1882
- "version": "2.7.0",
1889
+ "version": "2.8.0",
1883
1890
  "extraneous": true,
1884
1891
  "license": "MIT",
1885
1892
  "engines": {
@@ -3119,17 +3126,6 @@
3119
3126
  "triple-beam": "^1.3.0"
3120
3127
  }
3121
3128
  },
3122
- "node_modules/longjohn": {
3123
- "version": "0.2.12",
3124
- "extraneous": true,
3125
- "license": "MIT",
3126
- "dependencies": {
3127
- "source-map-support": "0.3.2 - 1.0.0"
3128
- },
3129
- "engines": {
3130
- "node": ">= 0.9.3"
3131
- }
3132
- },
3133
3129
  "node_modules/lunr": {
3134
3130
  "version": "2.3.9",
3135
3131
  "extraneous": true,
@@ -3272,7 +3268,7 @@
3272
3268
  }
3273
3269
  },
3274
3270
  "node_modules/moment-timezone": {
3275
- "version": "0.5.42",
3271
+ "version": "0.5.43",
3276
3272
  "license": "MIT",
3277
3273
  "dependencies": {
3278
3274
  "moment": "^2.29.4"
@@ -3606,7 +3602,7 @@
3606
3602
  }
3607
3603
  },
3608
3604
  "node_modules/package-changed": {
3609
- "version": "2.0.0",
3605
+ "version": "3.0.0",
3610
3606
  "extraneous": true,
3611
3607
  "license": "ISC",
3612
3608
  "dependencies": {
@@ -3947,7 +3943,7 @@
3947
3943
  }
3948
3944
  },
3949
3945
  "node_modules/readdir-glob": {
3950
- "version": "1.1.2",
3946
+ "version": "1.1.3",
3951
3947
  "license": "Apache-2.0",
3952
3948
  "dependencies": {
3953
3949
  "minimatch": "^5.1.0"
@@ -3991,10 +3987,10 @@
3991
3987
  }
3992
3988
  },
3993
3989
  "node_modules/resolve": {
3994
- "version": "1.22.1",
3990
+ "version": "1.22.2",
3995
3991
  "license": "MIT",
3996
3992
  "dependencies": {
3997
- "is-core-module": "^2.9.0",
3993
+ "is-core-module": "^2.11.0",
3998
3994
  "path-parse": "^1.0.7",
3999
3995
  "supports-preserve-symlinks-flag": "^1.0.0"
4000
3996
  },
@@ -4501,7 +4497,7 @@
4501
4497
  "license": "0BSD"
4502
4498
  },
4503
4499
  "node_modules/type-fest": {
4504
- "version": "3.6.1",
4500
+ "version": "3.7.2",
4505
4501
  "license": "(MIT OR CC0-1.0)",
4506
4502
  "engines": {
4507
4503
  "node": ">=14.16"
@@ -4522,7 +4518,7 @@
4522
4518
  }
4523
4519
  },
4524
4520
  "node_modules/typedoc": {
4525
- "version": "0.23.26",
4521
+ "version": "0.23.28",
4526
4522
  "extraneous": true,
4527
4523
  "license": "Apache-2.0",
4528
4524
  "dependencies": {
@@ -4538,7 +4534,7 @@
4538
4534
  "node": ">= 14.14"
4539
4535
  },
4540
4536
  "peerDependencies": {
4541
- "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x"
4537
+ "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x"
4542
4538
  }
4543
4539
  },
4544
4540
  "node_modules/typedoc-plugin-markdown": {
@@ -4575,7 +4571,7 @@
4575
4571
  }
4576
4572
  },
4577
4573
  "node_modules/typedoc/node_modules/minimatch": {
4578
- "version": "7.4.3",
4574
+ "version": "7.4.6",
4579
4575
  "extraneous": true,
4580
4576
  "license": "ISC",
4581
4577
  "dependencies": {
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "automated testing",
8
8
  "android"
9
9
  ],
10
- "version": "2.19.0",
10
+ "version": "2.20.1",
11
11
  "author": "Appium Contributors",
12
12
  "license": "Apache-2.0",
13
13
  "repository": {
@@ -126,7 +126,7 @@
126
126
  "lint-staged": "^13.0.3",
127
127
  "mocha": "^10.0.0",
128
128
  "pre-commit": "^1.2.2",
129
- "rimraf": "^4.0.4",
129
+ "rimraf": "^5.0.0",
130
130
  "semantic-release": "^20.0.2",
131
131
  "sinon": "^15.0.0",
132
132
  "webdriverio": "^8.0.2",