diff --git a/package.json b/package.json index 3e4c167b2..f214454bd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devicefarmer/stf", - "version": "3.6.3", + "version": "3.6.4", "description": "Smartphone Test Farm", "keywords": [ "adb", @@ -33,7 +33,7 @@ "prepare": "bower install && not-in-install && gulp build || in-install" }, "dependencies": { - "@devicefarmer/adbkit": "^3.2.1", + "@devicefarmer/adbkit": "^2.11.3", "@devicefarmer/adbkit-apkreader": "^3.2.3", "@devicefarmer/adbkit-monkey": "^1.2.0", "@devicefarmer/minicap-prebuilt": "^2.7.1", diff --git a/yarn.lock b/yarn.lock index f12ab75e2..85d058bc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16,30 +16,37 @@ debug "~4.3.1" yauzl "^2.7.0" -"@devicefarmer/adbkit-logcat@^2.1.2": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@devicefarmer/adbkit-logcat/-/adbkit-logcat-2.1.2.tgz#4db1eee8046ad8b296ca8ab757862d6172411a05" - integrity sha512-G4grpEa5s9s9wCRs8YB9LjFSnz0Os3g3RYIwZSxH3JFfV3aejL5xlu4hHMH4JY+d4oCCwImcEZJcFPY9BEP21w== +"@devicefarmer/adbkit-logcat@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@devicefarmer/adbkit-logcat/-/adbkit-logcat-1.1.0.tgz#866d3406dc9f3791446adfe3ae622ffc48607db4" + integrity sha512-K90P5gUXM/w+yzLvJIRQ+tJooNU6ipUPPQkljtPJ0laR66TGtpt4Gqsjm0n9dPHK1W5KGgU1R5wnCd6RTSlPNA== -"@devicefarmer/adbkit-monkey@^1.2.0", "@devicefarmer/adbkit-monkey@~1.2.0": +"@devicefarmer/adbkit-monkey@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@devicefarmer/adbkit-monkey/-/adbkit-monkey-1.2.0.tgz#d524ddbd65410ff71fc47d474d6a4b8c5d15bc9f" integrity sha512-IQ5D/rq0uuI4LHTRxhlF9lAxCR+Rg8VI7JthObe5N1gyeaxl6qRlWnRZYM7apOOASOadCnMcTY1hcDtG8VtaZw== dependencies: async "~0.2.9" -"@devicefarmer/adbkit@^3.2.1": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@devicefarmer/adbkit/-/adbkit-3.2.2.tgz#f89e22cf517cd003132bf782d9e21dac228c68bb" - integrity sha512-JkGAAIFGEEgFg7vDjVPixInrDb24YQceu8WnhX4cn3fWqC8/AOj5vnp8aavpRHNkoezvXx9JnnLDUfOanNc3Fg== +"@devicefarmer/adbkit-monkey@~1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@devicefarmer/adbkit-monkey/-/adbkit-monkey-1.0.1.tgz#7d225e5fdbdad8d6772453390ecab3f1b0eb72b1" + integrity sha512-HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g== dependencies: - "@devicefarmer/adbkit-logcat" "^2.1.2" - "@devicefarmer/adbkit-monkey" "~1.2.0" - bluebird "~3.7" - commander "^9.1.0" - debug "~4.3.1" - node-forge "^1.3.1" - split "~1.0.1" + async "~0.2.9" + +"@devicefarmer/adbkit@^2.11.3": + version "2.11.3" + resolved "https://registry.yarnpkg.com/@devicefarmer/adbkit/-/adbkit-2.11.3.tgz#0ad981a20aada3e4eff4871218f633c85cf7f2db" + integrity sha512-rsgWREAvSRQjdP9/3GoAV6Tq+o97haywgbTfCgt5yUqiDpaaq3hlH9FTo9XsdG8x+Jd0VQ9nTC2IXsDu8JGRSA== + dependencies: + "@devicefarmer/adbkit-logcat" "^1.1.0" + "@devicefarmer/adbkit-monkey" "~1.0.1" + bluebird "~2.9.24" + commander "^2.3.0" + debug "~2.6.3" + node-forge "^0.10.0" + split "~0.3.3" "@devicefarmer/minicap-prebuilt@^2.7.1": version "2.7.1" @@ -1155,7 +1162,7 @@ bluebird@3.4.x, bluebird@~3.4.1: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE= -bluebird@^3, bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.3.3, bluebird@^3.4.7, bluebird@^3.5.2, bluebird@~3.7: +bluebird@^3, bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.3.3, bluebird@^3.4.7, bluebird@^3.5.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -1165,6 +1172,11 @@ bluebird@~1.1.0: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-1.1.1.tgz#744e9980145e2ebc41a9e34826f913096667fb33" integrity sha1-dE6ZgBReLrxBqeNIJvkTCWZn+zM= +bluebird@~2.9.24: + version "2.9.34" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.9.34.tgz#2f7b4ec80216328a9fddebdf69c8d4942feff7d8" + integrity sha1-L3tOyAIWMoqf3evfacjUlC/v99g= + bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" @@ -2072,16 +2084,11 @@ commander@2.9.x: dependencies: graceful-readlink ">= 1.0.0" -commander@^2.5.0, commander@^2.7.1, commander@^2.9.0: +commander@^2.3.0, commander@^2.5.0, commander@^2.7.1, commander@^2.9.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^9.1.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-9.2.0.tgz#6e21014b2ed90d8b7c9647230d8b7a94a4a419a9" - integrity sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w== - commander@~2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" @@ -2619,7 +2626,7 @@ dateformat@^2.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI= -debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.9, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9: +debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.9, debug@~2.6.3, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -7503,11 +7510,6 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-forge@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" - integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== - node-gyp-build@^4.2.3, node-gyp-build@^4.3.0: version "4.4.0" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4" @@ -10638,13 +10640,20 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" -split@^1.0.0, split@^1.0.1, split@~1.0.1: +split@^1.0.0, split@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== dependencies: through "2" +split@~0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" + integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= + dependencies: + through "2" + splitargs@0: version "0.0.7" resolved "https://registry.yarnpkg.com/splitargs/-/splitargs-0.0.7.tgz#fe9f7ae657371b33b10cb80da143cf8249cf6b3b"