appium-android-driver 7.5.0 → 7.6.0
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.
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [7.6.0](https://github.com/appium/appium-android-driver/compare/v7.5.1...v7.6.0) (2024-01-06)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* update io.appium.settings to use newer location deps ([#894](https://github.com/appium/appium-android-driver/issues/894)) ([7712428](https://github.com/appium/appium-android-driver/commit/771242866db9cf8f1fd00e2e669325e09a328ee2))
|
|
7
|
+
|
|
8
|
+
## [7.5.1](https://github.com/appium/appium-android-driver/compare/v7.5.0...v7.5.1) (2024-01-05)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* Use built-in logger for doctor checks ([#893](https://github.com/appium/appium-android-driver/issues/893)) ([5fb33ad](https://github.com/appium/appium-android-driver/commit/5fb33adc600339fb7fa7e951c7069a8518128cd3))
|
|
14
|
+
|
|
1
15
|
## [7.5.0](https://github.com/appium/appium-android-driver/compare/v7.4.1...v7.5.0) (2024-01-05)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -10,6 +10,8 @@ export class JavaHomeValueCheck {
|
|
|
10
10
|
export const javaHomeValueCheck: JavaHomeValueCheck;
|
|
11
11
|
/** @satisfies {import('@appium/types').IDoctorCheck} */
|
|
12
12
|
export class AndroidSdkCheck {
|
|
13
|
+
/** @type {import('@appium/types').AppiumLogger} */
|
|
14
|
+
log: import('@appium/types').AppiumLogger;
|
|
13
15
|
TOOL_NAMES: string[];
|
|
14
16
|
diagnose(): Promise<import("@appium/types").DoctorCheckResult>;
|
|
15
17
|
fix(): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/checks.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/checks.js"],"names":[],"mappings":"AA2EA,kDAA0F;AAC1F,+CAAoF;AAEpF,wDAAwD;AACxD;IACE,+DAeC;IAED,uBAGC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,oDAA2D;AAE3D,wDAAwD;AACxD;IACE,mDAAmD;IACnD,KADW,OAAO,eAAe,EAAE,YAAY,CAC3C;IAEJ,qBAAmF;IAEnF,+DAwBC;IAED,uBAKC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,8CAAqD;AAErD,wDAAwD;AACxD;IACE,+DAKC;IAED,uBAOC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,8DAAqE;AAErE,wDAAwD;AACxD;IACE,yBAAuE;IACvE,2BAA0E;IAE1E,+DASC;IAED,uBAOC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,4DAAmE;AAEnE,wDAAwD;AACxD;IACE,sBAA4D;IAE5D,+DAMC;IAED,uBAKC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,sDAA6D;;;;;;;;;;;;;AA5O7D;;;;;;GAMG;AAEH,wDAAwD;AACxD;IACE;;;OAGG;IACH,qBAHW,MAAM,yCAMhB;IAFC,gBAAsB;IACtB,yBAAgB;IAGlB,+DAuBC;IAED,uBAKC;IAED,sBAEC;IAED,sBAEC;CACF"}
|
|
@@ -9,7 +9,6 @@ const support_1 = require("@appium/support");
|
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
require("@colors/colors");
|
|
11
11
|
const appium_adb_1 = require("appium-adb");
|
|
12
|
-
const log = support_1.logger.getLogger('AndroidDoctor');
|
|
13
12
|
const JAVA_HOME_VAR_NAME = support_1.system.isWindows() ? '%JAVA_HOME%' : '$JAVA_HOME';
|
|
14
13
|
const ENVIRONMENT_VARS_TUTORIAL_URL = 'https://github.com/appium/java-client/blob/master/docs/environment.md';
|
|
15
14
|
const JAVA_HOME_TUTORIAL = 'https://docs.oracle.com/cd/E21454_01/html/821-2531/inst_jdk_javahome_t.html';
|
|
@@ -108,11 +107,11 @@ class AndroidSdkCheck {
|
|
|
108
107
|
if (!sdkRoot) {
|
|
109
108
|
return support_1.doctor.nok(`${listOfTools} could not be found because ANDROID_HOME is NOT set!`);
|
|
110
109
|
}
|
|
111
|
-
log.info(` Checking ${listOfTools}`);
|
|
110
|
+
this.log.info(` Checking ${listOfTools}`);
|
|
112
111
|
const missingBinaries = [];
|
|
113
112
|
for (const binary of this.TOOL_NAMES) {
|
|
114
113
|
try {
|
|
115
|
-
log.info(` '${binary}' exists in ${await (0, appium_adb_1.getAndroidBinaryPath)(binary)}`);
|
|
114
|
+
this.log.info(` '${binary}' exists in ${await (0, appium_adb_1.getAndroidBinaryPath)(binary)}`);
|
|
116
115
|
}
|
|
117
116
|
catch (e) {
|
|
118
117
|
missingBinaries.push(binary);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checks.js","sourceRoot":"","sources":["../../../lib/doctor/checks.js"],"names":[],"mappings":";;;;;;AAAA,mCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"checks.js","sourceRoot":"","sources":["../../../lib/doctor/checks.js"],"names":[],"mappings":"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"}
|
package/lib/doctor/checks.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import {resolveExecutablePath} from './utils';
|
|
2
|
-
import {system, fs,
|
|
2
|
+
import {system, fs, doctor} from '@appium/support';
|
|
3
3
|
import path from 'path';
|
|
4
4
|
import '@colors/colors';
|
|
5
5
|
import {getAndroidBinaryPath, getSdkRootFromEnv} from 'appium-adb';
|
|
6
6
|
|
|
7
|
-
const log = logger.getLogger('AndroidDoctor');
|
|
8
7
|
|
|
9
8
|
const JAVA_HOME_VAR_NAME = system.isWindows() ? '%JAVA_HOME%' : '$JAVA_HOME';
|
|
10
9
|
const ENVIRONMENT_VARS_TUTORIAL_URL = 'https://github.com/appium/java-client/blob/master/docs/environment.md';
|
|
@@ -113,6 +112,9 @@ export const javaHomeValueCheck = new JavaHomeValueCheck();
|
|
|
113
112
|
|
|
114
113
|
/** @satisfies {import('@appium/types').IDoctorCheck} */
|
|
115
114
|
export class AndroidSdkCheck {
|
|
115
|
+
/** @type {import('@appium/types').AppiumLogger} */
|
|
116
|
+
log;
|
|
117
|
+
|
|
116
118
|
TOOL_NAMES = ['adb', 'emulator', `apkanalyzer${system.isWindows() ? '.bat' : ''}`];
|
|
117
119
|
|
|
118
120
|
async diagnose() {
|
|
@@ -124,11 +126,11 @@ export class AndroidSdkCheck {
|
|
|
124
126
|
);
|
|
125
127
|
}
|
|
126
128
|
|
|
127
|
-
log.info(` Checking ${listOfTools}`);
|
|
129
|
+
this.log.info(` Checking ${listOfTools}`);
|
|
128
130
|
const missingBinaries = [];
|
|
129
131
|
for (const binary of this.TOOL_NAMES) {
|
|
130
132
|
try {
|
|
131
|
-
log.info(` '${binary}' exists in ${await getAndroidBinaryPath(binary)}`);
|
|
133
|
+
this.log.info(` '${binary}' exists in ${await getAndroidBinaryPath(binary)}`);
|
|
132
134
|
} catch (e) {
|
|
133
135
|
missingBinaries.push(binary);
|
|
134
136
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-android-driver",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.6.0",
|
|
4
4
|
"description": "Android UiAutomator and Chrome support for Appium",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"appium",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"asyncbox": "^3.0.0",
|
|
63
63
|
"axios": "^1.x",
|
|
64
64
|
"bluebird": "^3.4.7",
|
|
65
|
-
"io.appium.settings": "^5.
|
|
65
|
+
"io.appium.settings": "^5.3.0",
|
|
66
66
|
"lodash": "^4.17.4",
|
|
67
67
|
"lru-cache": "^10.0.1",
|
|
68
68
|
"moment": "^2.24.0",
|