Fix adbkit-logcat resolution

Summary:
There is error written to console just after launch. It is related to wrong resolution of adbkit-logcat version. This diff forces resolution to the single version everywhere.

{F232416275}

Reviewed By: mweststrate

Differential Revision: D20632452

fbshipit-source-id: bf45bbd6d245dbb1093b093c20e808840689971b

desktop/app/package.json

@@ -10,9 +10,6 @@
   "category": "facebook-intern",
   "privileged": true,
   "license": "MIT",
-  "resolutions": {
-    "adbkit/adbkit-logcat": "2"
-  },
   "dependencies": {
     "@emotion/core": "^10.0.22",
     "@emotion/styled": "^10.0.23",
@@ -91,7 +88,7 @@
       "tmp",
       "flipper-doctor"
     ]
-  },  
+  },
   "optionalDependencies": {
     "7zip-bin-mac": "^1.0.1"
   }

desktop/package.json

@@ -69,7 +69,7 @@
   },
   "resolutions": {
     "@jest-runner/electron/electron": "8.0.1",
-    "adbkit/adbkit-logcat": "2",
+    "adbkit-logcat": "2.0.1",
     "@types/react": "16.9.17",
     "@types/react-dom": "16.9.4"
   },

desktop/yarn.lock

@@ -3346,16 +3346,11 @@ acorn@^7.1.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
   integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
 
-adbkit-logcat@2, adbkit-logcat@^2.0.1:
+adbkit-logcat@2.0.1, adbkit-logcat@^1.1.0, adbkit-logcat@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/adbkit-logcat/-/adbkit-logcat-2.0.1.tgz#d4986b9fc7cfda42733389d46a52124abef43ca5"
   integrity sha512-MznVzzEzcrWhIaIyblll+a0AL1TICJe/yuaia7HDYTAtiNabR/9amJkAnLt30U8/W7MVBc3mvU1jB/6MJ/TYHw==
 
-adbkit-logcat@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/adbkit-logcat/-/adbkit-logcat-1.1.0.tgz#01d7f9b0cef9093a30bcb3b007efff301508962f"
-  integrity sha1-Adf5sM75CTowvLOwB+//MBUIli8=
-
 adbkit-monkey@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/adbkit-monkey/-/adbkit-monkey-1.0.1.tgz#f291be701a2efc567a63fc7aa6afcded31430be1"