minor tweaks to the output for flutter_tools (#11115) * minor tweaks to the output for flutter_tools * update test expectations
diff --git a/packages/flutter_tools/lib/src/android/android_studio_validator.dart b/packages/flutter_tools/lib/src/android/android_studio_validator.dart index 512ea49..b472c70 100644 --- a/packages/flutter_tools/lib/src/android/android_studio_validator.dart +++ b/packages/flutter_tools/lib/src/android/android_studio_validator.dart
@@ -69,7 +69,7 @@ 'but Android Studio not found at this location.')); } 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).')); return new ValidationResult(ValidationType.missing, messages,
diff --git a/packages/flutter_tools/lib/src/android/gradle.dart b/packages/flutter_tools/lib/src/android/gradle.dart index 72e5220..25d4083 100644 --- a/packages/flutter_tools/lib/src/android/gradle.dart +++ b/packages/flutter_tools/lib/src/android/gradle.dart
@@ -132,7 +132,7 @@ // Note: Gradle may be bootstrapped and possibly downloaded as a side-effect // of validating the Gradle executable. This may take several seconds. 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(); if (gradle == null) { _injectGradleWrapper();
diff --git a/packages/flutter_tools/lib/src/base/logger.dart b/packages/flutter_tools/lib/src/base/logger.dart index a487ecf..8770efa 100644 --- a/packages/flutter_tools/lib/src/base/logger.dart +++ b/packages/flutter_tools/lib/src/base/logger.dart
@@ -221,7 +221,7 @@ stopwatch.reset(); String prefix; - const int prefixWidth = 12; + const int prefixWidth = 8; if (millis == 0) { prefix = ''.padLeft(prefixWidth); } else {
diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index e9f845f..a4ea001 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -124,7 +124,7 @@ final RegExp xcodeVersionRegex = new RegExp(r'Xcode ([0-9.]+)'); void _updateXcodeVersion() { 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); if (match == null) return;
diff --git a/packages/flutter_tools/test/base/logger_test.dart b/packages/flutter_tools/test/base/logger_test.dart index 4ccf773..8131b0a 100644 --- a/packages/flutter_tools/test/base/logger_test.dart +++ b/packages/flutter_tools/test/base/logger_test.dart
@@ -16,10 +16,10 @@ verboseLogger.printTrace('Oooh, I do I do I do'); verboseLogger.printError('Helpless!'); - expect(mockLogger.statusText, matches(r'^\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Hey Hey Hey Hey\n' - r'\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Oooh, I do I do I do\n$')); + expect(mockLogger.statusText, matches(r'^\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Hey Hey Hey Hey\n' + r'\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Oooh, I do I do I do\n$')); expect(mockLogger.traceText, ''); - expect(mockLogger.errorText, matches(r'^\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Helpless!\n$')); + expect(mockLogger.errorText, matches(r'^\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Helpless!\n$')); }); }); }