Merge branch '0.12.6+x'

CHANGELOG.md

@@ -11,6 +11,10 @@
 [focusing]: http://jasmine.github.io/2.1/focused_specs.html
 [issue 16]: https://github.com/dart-lang/test/issues/16
 
+## 0.12.6+1
+
+* Declare compatibility with `http_multi_server` 2.0.0.
+
 ## 0.12.6
 
 * Add a machine-readable JSON reporter. For details, see

lib/src/runner/loader.dart

@@ -8,7 +8,7 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:analyzer/analyzer.dart';
+import 'package:analyzer/analyzer.dart' hide Configuration;
 import 'package:async/async.dart';
 import 'package:path/path.dart' as p;
 import 'package:stack_trace/stack_trace.dart';

pubspec.yaml

@@ -6,14 +6,14 @@ homepage: https://github.com/dart-lang/test
 environment:
   sdk: '>=1.11.0 <1.16.0'
 dependencies:
-  analyzer: '>=0.23.0 <0.27.0'
+  analyzer: '>=0.23.0 <0.28.0'
   args: '>=0.12.1 <0.14.0'
   async: '^1.4.0'
   barback: '>=0.14.0 <0.16.0'
   collection: '^1.1.0'
   crypto: '^0.9.0'
   glob: '^1.0.0'
-  http_multi_server: '^1.0.0'
+  http_multi_server: '>=1.0.0 <3.0.0'
   http_parser: '>=0.0.2 <2.0.0'
   path: '^1.2.0'
   pool: '^1.2.0'