jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollback workaround for Android SDK detection

Browse Source 
Summary: Rolling back workaround for Android SDK detection as it breaks detection with Java 8 while fixing Java 9+

Reviewed By: cekkaewnumchai

Differential Revision: D19146945

fbshipit-source-id: 2bea318d5f5cfafdf213d2ec73e837f6e86c9f33
This commit is contained in:
Anton Nikolaev
2019-12-17 18:24:03 -08:00
committed by Facebook Github Bot
parent 91d5b95341
commit 5eaa87c676
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doctor/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "flipper-doctor", "name": "flipper-doctor",
"version": "0.2.2", "version": "0.2.3",
"description": "Utility for checking for issues with a flipper installation", "description": "Utility for checking for issues with a flipper installation",
"main": "lib/index.js", "main": "lib/index.js",
"types": "lib/index.d.ts", "types": "lib/index.d.ts",

3
doctor/src/environmentInfo.ts
View File

@@ -32,9 +32,6 @@ export type EnvironmentInfo = {
}; };
export async function getEnvInfo(): Promise<EnvironmentInfo> { export async function getEnvInfo(): Promise<EnvironmentInfo> {
// Temporary fix for https://github.com/facebook/flipper/issues/667 until it properly fixed in 'envinfo'.
process.env.JAVA_OPTS =
'-XX:+IgnoreUnrecognizedVMOptions --add-modules java.se.ee';
return JSON.parse( return JSON.parse(
await run( await run(
{ {

2
package.json
View File

@@ -136,7 +136,7 @@
"emotion": "^10.0.23", "emotion": "^10.0.23",
"expand-tilde": "^2.0.2", "expand-tilde": "^2.0.2",
"express": "^4.15.2", "express": "^4.15.2",
"flipper-doctor": "^0.2.2", "flipper-doctor": "^0.2.3",
"fs-extra": "^8.0.1", "fs-extra": "^8.0.1",
"immer": "^5.0.1", "immer": "^5.0.1",
"immutable": "^4.0.0-rc.12", "immutable": "^4.0.0-rc.12",

8
yarn.lock
View File

@@ -4147,10 +4147,10 @@ flatted@^2.0.0:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
flipper-doctor@^0.2.2: flipper-doctor@^0.2.3:
version "0.2.2" version "0.2.3"
resolved "https://registry.yarnpkg.com/flipper-doctor/-/flipper-doctor-0.2.2.tgz#ad51882bd82fea105034eab4db04aa9da2e45fdd" resolved "https://registry.yarnpkg.com/flipper-doctor/-/flipper-doctor-0.2.3.tgz#2678c3dc924c1dd69cda65aef9f43040f3b8e085"
integrity sha512-bi5xO5GO0LzwEHif2k4gpL4aXlt70tts2wxTsTZS4ng6VykV/5qlawIcOg5vn57+rsito+zWsyUhYEMgKu0BZg== integrity sha512-61BJUid7yWu/LzuYYuwdOgakQXWoEXV9+PwKPWwwup73u4k80nUdf+Hx4Ev0dMS/mjQuZ3KwmmxFdFhV/3iWTQ==
dependencies: dependencies:
"@types/node" "^12.12.12" "@types/node" "^12.12.12"
envinfo "^7.4.0" envinfo "^7.4.0"