From eafcc6918aa0869039c5b4bd03973a87e2d76e9b Mon Sep 17 00:00:00 2001
From: Kazuaki Matsuo <fly.49.89.over@gmail.com>
Date: Thu, 9 Nov 2023 22:47:44 -0800
Subject: [PATCH 1/2] chore: change the reference of adbkit-apkreader

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e0ebc625..ffec6b98 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
   "homepage": "https://github.com/appium/appium-adb",
   "dependencies": {
     "@appium/support": "^4.0.0",
-    "adbkit-apkreader": "^3.1.2",
+    "@devicefarmer/adbkit-apkreader": "^3.2.4",
     "async-lock": "^1.0.0",
     "asyncbox": "^3.0.0",
     "bluebird": "^3.4.7",

From dacd855a4a176c7d3a5c742b902f1d4a87bff489 Mon Sep 17 00:00:00 2001
From: Kazuaki Matsuo <fly.49.89.over@gmail.com>
Date: Thu, 9 Nov 2023 22:51:53 -0800
Subject: [PATCH 2/2] update import paths

---
 lib/helpers.js                | 2 +-
 lib/stubs.ts                  | 2 +-
 lib/tools/android-manifest.js | 2 +-
 lib/tools/apk-utils.js        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index de980254..7485266e 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -602,7 +602,7 @@ function buildInstallArgs (apiLevel, options = {}) {
  * to extract some vital values from it
  *
  * @param {Record<string, any>} manifest The manifest content formatted as JSON
- * See https://www.npmjs.com/package/adbkit-apkreader for detailed format description
+ * See https://www.npmjs.com/package/@devicefarmer/adbkit-apkreader for detailed format description
  * @returns {ManifestInfo}
  */
 function parseManifest (manifest) {
diff --git a/lib/stubs.ts b/lib/stubs.ts
index 92c633e1..773ac1a6 100644
--- a/lib/stubs.ts
+++ b/lib/stubs.ts
@@ -1,3 +1,3 @@
 // @ts-nocheck
-declare module 'adbkit-apkreader';
+declare module '@devicefarmer/adbkit-apkreader';
 declare module 'asyncbox';
diff --git a/lib/tools/android-manifest.js b/lib/tools/android-manifest.js
index 1e48d5aa..927d4a77 100644
--- a/lib/tools/android-manifest.js
+++ b/lib/tools/android-manifest.js
@@ -7,7 +7,7 @@ import {
 import { fs, zip, tempDir, util } from '@appium/support';
 import _ from 'lodash';
 import path from 'path';
-import ApkReader from 'adbkit-apkreader';
+import ApkReader from '@devicefarmer/adbkit-apkreader';
 
 const manifestMethods = {};
 
diff --git a/lib/tools/apk-utils.js b/lib/tools/apk-utils.js
index 8c6a87f9..c0d4f57a 100644
--- a/lib/tools/apk-utils.js
+++ b/lib/tools/apk-utils.js
@@ -13,7 +13,7 @@ import { fs, util, mkdirp, timing } from '@appium/support';
 import semver from 'semver';
 import os from 'os';
 import { LRUCache } from 'lru-cache';
-import ApkReader from 'adbkit-apkreader';
+import ApkReader from '@devicefarmer/adbkit-apkreader';
 
 const apkUtilsMethods = {};