appium-espresso-driver 2.1.2 → 2.2.2

package/lib/server-builder.js

@@ -1,7 +1,6 @@
 import { SubProcess } from 'teen_process';
-import { fs, logger, system } from '@appium/support';
+import { fs, system } from '@appium/support';
 import _ from 'lodash';
-import log from './logger';
 import path from 'path';
 import { EOL } from 'os';
 import { updateDependencyLines } from './utils';
@@ -22,11 +21,10 @@ const VERSION_KEYS = [
   'kotlin',
   'sourceCompatibility',
   'targetCompatibility',
-  'jvmTarget'
+  'jvmTarget',
+  'composeVersion'
 ];
 
-const gradleLog = logger.getLogger('Gradle');
-
 function buildServerSigningConfig (args) {
   return {
     zipAlign: true,
@@ -38,7 +36,8 @@ function buildServerSigningConfig (args) {
 }
 
 class ServerBuilder {
-  constructor (args = {}) {
+  constructor (log, args = {}) {
+    this.log = log;
     this.serverPath = args.serverPath;
     this.showGradleLog = args.showGradleLog;
 
@@ -73,7 +72,7 @@ class ServerBuilder {
   }
 
   getCommand () {
-    const cmd = system.isWindows() ? 'gradlew.bat' : './gradlew';
+    const cmd = system.isWindows() ? 'gradlew.bat' : path.resolve(this.serverPath, 'gradlew');
     const buildProperty = (key, value) => value ? `-P${key}=${value}` : null;
     let args = VERSION_KEYS
       .filter((key) => key !== GRADLE_VERSION_KEY)
@@ -150,7 +149,7 @@ class ServerBuilder {
         continue;
       }
 
-      log.info(`Adding the following ${propName} to build.gradle.kts: ${deps}`);
+      this.log.info(`Adding the following ${propName} to build.gradle.kts: ${deps}`);
       configuration = updateDependencyLines(configuration, propName, deps);
     }
     await fs.writeFile(buildPath, configuration, 'utf8');
@@ -158,7 +157,7 @@ class ServerBuilder {
 
   async runBuildProcess () {
     const {cmd, args} = this.getCommand();
-    log.debug(`Beginning build with command '${cmd} ${args.join(' ')}' ` +
+    this.log.debug(`Beginning build with command '${cmd} ${args.join(' ')}' ` +
       `in directory '${this.serverPath}'`);
     const gradlebuild = new SubProcess(cmd, args, {
       cwd: this.serverPath,
@@ -168,13 +167,13 @@ class ServerBuilder {
     let buildLastLines = [];
 
     const logMsg = `Output from Gradle ${this.showGradleLog ? 'will' : 'will not'} be logged`;
-    log.debug(`${logMsg}. To change this, use 'showGradleLog' desired capability`);
+    this.log.debug(`${logMsg}. To change this, use 'showGradleLog' desired capability`);
     gradlebuild.on('stream-line', (line) => {
       if (this.showGradleLog) {
         if (line.startsWith('[STDERR]')) {
-          gradleLog.warn(line);
+          this.log.warn(`[Gradle] ${line}`);
         } else {
-          gradleLog.info(line);
+          this.log.info(`[Gradle] ${line}`);
         }
       }
       buildLastLines.push(`${EOL}${line}`);
@@ -189,7 +188,7 @@ class ServerBuilder {
     } catch (err) {
       let msg = `Unable to build Espresso server - ${err.message}\n` +
         `Gradle error message:${EOL}${buildLastLines}`;
-      log.errorAndThrow(msg);
+      this.log.errorAndThrow(msg);
     }
   }
 }