From d2abdf8e6b27cdcea79e62b062e31a590b91b2ed Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 5 Apr 2017 09:47:02 -0700 Subject: [PATCH] Roll Dart to 1.23.0-dev.11.5 (#9151) * Roll Dart to 1.23.0-dev.11.3. This is expected to fix the Windows crashes reported in https://github.com/flutter/flutter/issues/8912. * fix tests * Roll to 1.23.0-dev.11.5 * Fix tests --- bin/internal/dart-sdk.version | 2 +- .../flutter_tools/test/analyze_once_test.dart | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bin/internal/dart-sdk.version b/bin/internal/dart-sdk.version index 062fc5db8a..6ad63bb06a 100644 --- a/bin/internal/dart-sdk.version +++ b/bin/internal/dart-sdk.version @@ -1 +1 @@ -1.23.0-dev.10.0 +1.23.0-dev.11.5 diff --git a/packages/flutter_tools/test/analyze_once_test.dart b/packages/flutter_tools/test/analyze_once_test.dart index 41720f8fe1..b9f0bd1078 100644 --- a/packages/flutter_tools/test/analyze_once_test.dart +++ b/packages/flutter_tools/test/analyze_once_test.dart @@ -6,6 +6,7 @@ import 'dart:async'; import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/base/file_system.dart'; +import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/analyze.dart'; import 'package:flutter_tools/src/commands/create.dart'; @@ -16,6 +17,9 @@ import 'src/common.dart'; import 'src/context.dart'; void main() { + + final String analyzerSeparator = platform.isWindows ? '-' : '•'; + group('analyze once', () { Directory tempDir; File libMain; @@ -86,7 +90,7 @@ void main() { arguments: ['analyze'], statusTextContains: [ 'Analyzing', - '[warning] The parameter \'child\' is required', + 'warning $analyzerSeparator The parameter \'child\' is required', '1 warning found.', ], toolExit: true, @@ -100,7 +104,7 @@ void main() { arguments: ['analyze', libMain.path], statusTextContains: [ 'Analyzing', - '[warning] The parameter \'child\' is required', + 'warning $analyzerSeparator The parameter \'child\' is required', '1 warning found.', ], toolExit: true, @@ -126,8 +130,8 @@ void main() { arguments: ['analyze'], statusTextContains: [ 'Analyzing', - '[warning] The parameter \'child\' is required', - '[lint] Only throw instances of classes extending either Exception or Error', + 'warning $analyzerSeparator The parameter \'child\' is required', + 'lint $analyzerSeparator Only throw instances of classes extending either Exception or Error', '1 warning and 1 lint found.', ], toolExit: true, @@ -141,8 +145,8 @@ void main() { arguments: ['analyze', libMain.path], statusTextContains: [ 'Analyzing', - '[warning] The parameter \'child\' is required', - '[lint] Only throw instances of classes extending either Exception or Error', + 'warning $analyzerSeparator The parameter \'child\' is required', + 'lint $analyzerSeparator Only throw instances of classes extending either Exception or Error', '1 warning and 1 lint found.', ], toolExit: true,