appium-android-driver 5.0.15 → 5.1.0

package/lib/driver.js

@@ -1,4 +1,4 @@
-import { BaseDriver, DeviceSettings } from '@appium/base-driver';
+import { BaseDriver, DeviceSettings } from 'appium/driver';
 import desiredConstraints from './desired-caps';
 import commands from './commands/index';
 import {
@@ -7,7 +7,7 @@ import {
 } from './android-helpers';
 import _ from 'lodash';
 import { DEFAULT_ADB_PORT } from 'appium-adb';
-import { fs, tempDir, util } from '@appium/support';
+import { fs, tempDir, util } from 'appium/support';
 import { retryInterval } from 'asyncbox';
 import { SharedPrefsBuilder } from 'shared-preferences-builder';
 import B from 'bluebird';

package/lib/logger.js

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

package/lib/uiautomator.js

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

package/lib/unlock-helpers.js

@@ -1,7 +1,7 @@
 import logger from './logger';
 import { sleep } from 'asyncbox';
 import _ from 'lodash';
-import { util } from '@appium/support';
+import { util } from 'appium/support';
 
 const PIN_UNLOCK = 'pin';
 const PIN_UNLOCK_KEY_EVENT = 'pinWithKeyEvent';

package/lib/webview-helpers.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import logger from './logger';
 import axios from 'axios';
-import { util } from '@appium/support';
+import { util } from 'appium/support';
 import { findAPortNotInUse } from 'portscanner';
 import LRU from 'lru-cache';
 import B from 'bluebird';

package/package.json

@@ -9,7 +9,7 @@
     "mobile",
     "mobile testing"
   ],
-  "version": "5.0.15",
+  "version": "5.1.0",
   "author": "appium",
   "license": "Apache-2.0",
   "repository": {
@@ -35,8 +35,6 @@
     "bootstrap/bin/AppiumBootstrap.jar"
   ],
   "dependencies": {
-    "@appium/base-driver": "^8.5.2",
-    "@appium/support": "^2.58.0",
     "@babel/runtime": "^7.0.0",
     "appium-adb": "^9.6.0",
     "appium-chromedriver": "^5.0.1",
@@ -76,6 +74,9 @@
     "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",
@@ -84,6 +85,7 @@
     "@babel/eslint-parser": "^7.16.3",
     "@semantic-release/git": "^10.0.1",
     "@xmldom/xmldom": "^0.x",
+    "appium": "^2.0.0-beta.40",
     "android-apidemos": "^4.0.0",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",

package/build/lib/server.js

@@ -1,34 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-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) {
-  let d = new _driver.default();
-  let routeConfiguringFunction = (0, _baseDriver.routeConfiguringFunction)(d);
-  let server = await (0, _baseDriver.server)({
-    routeConfiguringFunction,
-    port,
-    hostname: host
-  });
-
-  _logger.default.info(`AndroidDriver server listening on http://${host}:${port}`);
-
-  d.server = server;
-  return server;
-}require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliL3NlcnZlci5qcyIsIm5hbWVzIjpbInN0YXJ0U2VydmVyIiwicG9ydCIsImhvc3QiLCJkIiwiQW5kcm9pZERyaXZlciIsInJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiIsIm1ha2VSb3V0ZXIiLCJzZXJ2ZXIiLCJiYXNlU2VydmVyIiwiaG9zdG5hbWUiLCJsb2ciLCJpbmZvIl0sInNvdXJjZVJvb3QiOiIuLi8uLiIsInNvdXJjZXMiOlsibGliL3NlcnZlci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgbG9nIGZyb20gJy4vbG9nZ2VyJztcbmltcG9ydCB7IHNlcnZlciBhcyBiYXNlU2VydmVyLCByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24gYXMgbWFrZVJvdXRlciB9IGZyb20gJ0BhcHBpdW0vYmFzZS1kcml2ZXInO1xuaW1wb3J0IEFuZHJvaWREcml2ZXIgZnJvbSAnLi9kcml2ZXInO1xuXG5hc3luYyBmdW5jdGlvbiBzdGFydFNlcnZlciAocG9ydCwgaG9zdCkge1xuICBsZXQgZCA9IG5ldyBBbmRyb2lkRHJpdmVyKCk7XG4gIGxldCByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24gPSBtYWtlUm91dGVyKGQpO1xuICBsZXQgc2VydmVyID0gYXdhaXQgYmFzZVNlcnZlcih7cm91dGVDb25maWd1cmluZ0Z1bmN0aW9uLCBwb3J0LCBob3N0bmFtZTogaG9zdH0pO1xuICBsb2cuaW5mbyhgQW5kcm9pZERyaXZlciBzZXJ2ZXIgbGlzdGVuaW5nIG9uIGh0dHA6Ly8ke2hvc3R9OiR7cG9ydH1gKTtcbiAgZC5zZXJ2ZXIgPSBzZXJ2ZXI7XG4gIHJldHVybiBzZXJ2ZXI7XG59XG5cbmV4cG9ydCB7IHN0YXJ0U2VydmVyIH07XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBRUEsZUFBZUEsV0FBZixDQUE0QkMsSUFBNUIsRUFBa0NDLElBQWxDLEVBQXdDO0VBQ3RDLElBQUlDLENBQUMsR0FBRyxJQUFJQyxlQUFKLEVBQVI7RUFDQSxJQUFJQyx3QkFBd0IsR0FBRyxJQUFBQyxvQ0FBQSxFQUFXSCxDQUFYLENBQS9CO0VBQ0EsSUFBSUksTUFBTSxHQUFHLE1BQU0sSUFBQUMsa0JBQUEsRUFBVztJQUFDSCx3QkFBRDtJQUEyQkosSUFBM0I7SUFBaUNRLFFBQVEsRUFBRVA7RUFBM0MsQ0FBWCxDQUFuQjs7RUFDQVEsZUFBQSxDQUFJQyxJQUFKLENBQVUsNENBQTJDVCxJQUFLLElBQUdELElBQUssRUFBbEU7O0VBQ0FFLENBQUMsQ0FBQ0ksTUFBRixHQUFXQSxNQUFYO0VBQ0EsT0FBT0EsTUFBUDtBQUNEIn0=

package/lib/server.js

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