Merge pull request #6 from WanderaOrg/update-from-openstf

Update from openstf
wandera · Jun 4, 2019 · ddbbb0a · ddbbb0a
2 parents 7c6365a + ba4006c
commit ddbbb0a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Changelog
 
-## HEAD
+## 3.4.1 (2019-05-03)
 
 ### Fixes
 
 - Updated [adbkit-apkreader](https://github.com/openstf/adbkit-apkreader) to fix an APK manifest parsing issue on applications processed by 360 encryption services, which changes the `application` key to `com.stub.StubApp`. Thanks @JChord!
+- Updated [adbkit](https://github.com/openstf/adbkit) to public key parsing on recent versions of ADB. Thanks @codeskyblue!
 
 ### Enhancements
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stf",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Smartphone Test Farm",
   "keywords": [
     "adb",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@slack/client": "^3.5.4",
-    "adbkit": "^2.9.2",
+    "adbkit": "^2.11.1",
     "adbkit-apkreader": "^3.1.1",
     "adbkit-monkey": "^1.0.1",
     "aws-sdk": "^2.4.13",

diff --git a/yarn.lock b/yarn.lock
@@ -106,16 +106,16 @@ adbkit-monkey@^1.0.1, adbkit-monkey@~1.0.1:
   dependencies:
     async "~0.2.9"
 
-adbkit@^2.9.2:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/adbkit/-/adbkit-2.10.0.tgz#ba2d46c290fc70e70b2422164268f82306303570"
+adbkit@^2.11.1:
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/adbkit/-/adbkit-2.11.1.tgz#7da847fe561254f3121088947bc1907ef053e894"
   dependencies:
     adbkit-logcat "^1.1.0"
     adbkit-monkey "~1.0.1"
     bluebird "~2.9.24"
     commander "^2.3.0"
     debug "~2.6.3"
-    node-forge "^0.6.12"
+    node-forge "^0.7.1"
     split "~0.3.3"
 
 adm-zip@0.4.4:
@@ -4456,9 +4456,9 @@ node-forge@0.2.24:
   version "0.2.24"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.2.24.tgz#fa6f846f42fa93f63a0a30c9fbff7b4e130e0858"
 
-node-forge@^0.6.12:
-  version "0.6.49"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.49.tgz#f1ee95d5d74623938fe19d698aa5a26d54d2f60f"
+node-forge@^0.7.1:
+  version "0.7.6"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac"
 
 node-gyp@^3.3.1:
   version "3.6.2"