Commit 40a65e1f authored by Devon Carew's avatar Devon Carew Committed by GitHub

minor tweaks to the output for flutter_tools (#11115)

* minor tweaks to the output for flutter_tools

* update test expectations
parent 63d25006
...@@ -69,7 +69,7 @@ class NoAndroidStudioValidator extends DoctorValidator { ...@@ -69,7 +69,7 @@ class NoAndroidStudioValidator extends DoctorValidator {
'but Android Studio not found at this location.')); 'but Android Studio not found at this location.'));
} }
messages.add(new ValidationMessage( messages.add(new ValidationMessage(
'Android Studio not found. Download from https://developer.android.com/studio/index.html\n' 'Android Studio not found; download from https://developer.android.com/studio/index.html\n'
'(or visit https://flutter.io/setup/#android-setup for detailed instructions).')); '(or visit https://flutter.io/setup/#android-setup for detailed instructions).'));
return new ValidationResult(ValidationType.missing, messages, return new ValidationResult(ValidationType.missing, messages,
......
...@@ -132,7 +132,7 @@ Future<String> _ensureGradle() async { ...@@ -132,7 +132,7 @@ Future<String> _ensureGradle() async {
// Note: Gradle may be bootstrapped and possibly downloaded as a side-effect // Note: Gradle may be bootstrapped and possibly downloaded as a side-effect
// of validating the Gradle executable. This may take several seconds. // of validating the Gradle executable. This may take several seconds.
Future<String> _initializeGradle() async { Future<String> _initializeGradle() async {
final Status status = logger.startProgress('Initializing Gradle...', expectSlowOperation: true); final Status status = logger.startProgress('Initializing gradle...', expectSlowOperation: true);
String gradle = _locateProjectGradlew(); String gradle = _locateProjectGradlew();
if (gradle == null) { if (gradle == null) {
_injectGradleWrapper(); _injectGradleWrapper();
......
...@@ -221,7 +221,7 @@ class VerboseLogger extends Logger { ...@@ -221,7 +221,7 @@ class VerboseLogger extends Logger {
stopwatch.reset(); stopwatch.reset();
String prefix; String prefix;
const int prefixWidth = 12; const int prefixWidth = 8;
if (millis == 0) { if (millis == 0) {
prefix = ''.padLeft(prefixWidth); prefix = ''.padLeft(prefixWidth);
} else { } else {
......
...@@ -124,7 +124,7 @@ class Xcode { ...@@ -124,7 +124,7 @@ class Xcode {
final RegExp xcodeVersionRegex = new RegExp(r'Xcode ([0-9.]+)'); final RegExp xcodeVersionRegex = new RegExp(r'Xcode ([0-9.]+)');
void _updateXcodeVersion() { void _updateXcodeVersion() {
try { try {
_xcodeVersionText = processManager.runSync(<String>['/usr/bin/xcodebuild', '-version']).stdout.replaceAll('\n', ', '); _xcodeVersionText = processManager.runSync(<String>['/usr/bin/xcodebuild', '-version']).stdout.trim().replaceAll('\n', ', ');
final Match match = xcodeVersionRegex.firstMatch(xcodeVersionText); final Match match = xcodeVersionRegex.firstMatch(xcodeVersionText);
if (match == null) if (match == null)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment