DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use right stream for Java, on mac try to autoselect Java 1.8 (#8099)

Browse Source 
* Use right stream for Java, on mac try to autoselect Java 1.8
This commit is contained in:
Dan Field 2019-03-08 23:38:59 -08:00 committed by GitHub
parent a63ff46327
commit e77337bb1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tools/android_lint/bin/main.dart
View File

@ -102,7 +102,15 @@ Future<int> runLint(ArgParser argParser, ArgResults argResults) async {
if (argResults['html']) {
lintArgs.addAll(<String>['--html', argResults['out']]);
}
final Process lintProcess = await processManager.start(lintArgs);
final String javaHome = await getJavaHome();
final Process lintProcess = await processManager.start(
lintArgs,
environment: javaHome != null
? <String, String>{
'JAVA_HOME': javaHome,
}
: null,
);
lintProcess.stdout.pipe(stdout);
lintProcess.stderr.pipe(stderr);
return await lintProcess.exitCode;
@ -154,11 +162,36 @@ ArgParser setupOptions() {
return argParser;
}
/// On macOS, we can try to find Java 1.8.
///
/// Otherwise, default to whatever JAVA_HOME is already.
Future<String> getJavaHome() async {
if (Platform.isMacOS) {
final ProcessResult result = await processManager.run(
<String>['/usr/libexec/java_home', '-v', '1.8', '-F'],
);
if (result.exitCode == 0) {
return result.stdout.trim();
}
}
return Platform.environment['JAVA_HOME'];
}
/// Checks that `java` points to Java 1.8.
///
/// The SDK lint tool may not work with Java > 1.8.
Future<void> checkJava1_8() async {
print('Checking Java version...');
if (Platform.isMacOS) {
final ProcessResult result = await processManager.run(
<String>['/usr/libexec/java_home', '-v', '1.8', '-F'],
);
if (result.exitCode != 0) {
print('Java 1.8 not available - the linter may not work properly.');
}
return;
}
final ProcessResult javaResult = await processManager.run(
<String>['java', '-version'],
);
@ -167,8 +200,9 @@ Future<void> checkJava1_8() async {
'Ensure Java is installed and available on your path.');
print(javaResult.stderr);
}
final String javaVersionStdout = javaResult.stdout;
if (javaVersionStdout.contains('"1.8')) {
// `java -version` writes to stderr.
final String javaVersionStdout = javaResult.stderr;
if (!javaVersionStdout.contains('"1.8')) {
print('The Android SDK tools may not work properly with your Java version. '
'If this process fails, please retry using Java 1.8.');
}