Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: appium/appium-uiautomator2-driver
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 65c4a7125deaedbb58fe6dc526b67f6c172a8840
Choose a base ref
..
head repository: appium/appium-uiautomator2-driver
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 340f863d6e94aecb19991a7d33793d044c6de76b
Choose a head ref
Showing with 22 additions and 7 deletions.
  1. +12 −0 CHANGELOG.md
  2. +0 −1 lib/driver.ts
  3. +4 −1 lib/uiautomator2.js
  4. +3 −4 package.json
  5. +3 −1 scripts/reset.js
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## [3.7.4](https://github.com/appium/appium-uiautomator2-driver/compare/v3.7.3...v3.7.4) (2024-07-23)

### Bug Fixes

* stop uia2 process as well in cleanupAutomationLeftovers ([#807](https://github.com/appium/appium-uiautomator2-driver/issues/807)) ([69abc42](https://github.com/appium/appium-uiautomator2-driver/commit/69abc425ff36359ac7b58bead82ece0e0fdd1ab3))

## [3.7.3](https://github.com/appium/appium-uiautomator2-driver/compare/v3.7.2...v3.7.3) (2024-07-15)

### Miscellaneous Chores

* Bump android driver ([#806](https://github.com/appium/appium-uiautomator2-driver/issues/806)) ([b109867](https://github.com/appium/appium-uiautomator2-driver/commit/b109867e7e2a06fc301c9e82596d698979a338ee))

## [3.7.2](https://github.com/appium/appium-uiautomator2-driver/compare/v3.7.1...v3.7.2) (2024-07-09)

### Miscellaneous Chores
1 change: 0 additions & 1 deletion lib/driver.ts
View file
Original file line number Diff line number Diff line change
@@ -910,7 +910,6 @@ class AndroidUiautomator2Driver
this.log.warn(`Cannot restore the original IME: ${e.message}`);
}
}
await this.adb.stopLogcat();
try {
await this.releaseSystemPort();
} catch (error) {
5 changes: 4 additions & 1 deletion lib/uiautomator2.js
View file
Original file line number Diff line number Diff line change
@@ -413,7 +413,10 @@ class UiAutomator2Server {
}

try {
await this.adb.forceStop(SERVER_TEST_PACKAGE_ID);
await B.all([
this.adb.forceStop(SERVER_PACKAGE_ID),
this.adb.forceStop(SERVER_TEST_PACKAGE_ID)
]);
} catch (ignore) {}
if (strictCleanup) {
// https://github.com/appium/appium/issues/10749
7 changes: 3 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"automated testing",
"android"
],
"version": "3.7.2",
"version": "3.7.4",
"bugs": {
"url": "https://github.com/appium/appium-uiautomator2-driver/issues"
},
@@ -57,7 +57,7 @@
},
"dependencies": {
"appium-adb": "^12.4.7",
"appium-android-driver": "^9.7.0",
"appium-android-driver": "^9.8.0",
"appium-chromedriver": "^5.6.28",
"appium-uiautomator2-server": "^7.0.14",
"asyncbox": "^3.0.0",
@@ -83,7 +83,7 @@
"@types/bluebird": "^3.5.38",
"@types/lodash": "^4.14.194",
"@types/mocha": "^10.0.1",
"@types/node": "^20.2.3",
"@types/node": "^22.0.0",
"@types/portscanner": "^2.1.1",
"@types/semver": "^7.5.0",
"@types/source-map-support": "^0.x",
@@ -95,7 +95,6 @@
"chai": "^5.1.1",
"chai-as-promised": "^8.0.0",
"conventional-changelog-conventionalcommits": "^8.0.0",
"fancy-log": "^2.0.0",
"mocha": "^10.0.0",
"prettier": "^3.0.3",
"rimraf": "^6.0.1",
4 changes: 3 additions & 1 deletion scripts/reset.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
const { ADB } = require('appium-adb');
const B = require('bluebird');
const log = require('fancy-log');
const {logger} = require('appium/support');

const log = logger.getLogger('UIA2Reset');

const SERVER_PKGS = [
'io.appium.uiautomator2.server',