Merge remote-tracking branch 'origin/update_pkg_analazyer' into 0.12.6+x
diff --git a/lib/src/runner/loader.dart b/lib/src/runner/loader.dart
index 62fb46b..92d0286 100644
--- a/lib/src/runner/loader.dart
+++ b/lib/src/runner/loader.dart
@@ -8,7 +8,7 @@
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';
diff --git a/pubspec.yaml b/pubspec.yaml
index 4360561..24c0cec 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@
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'
diff --git a/test/runner/runner_test.dart b/test/runner/runner_test.dart
index 508b7fa..df5665b 100644
--- a/test/runner/runner_test.dart
+++ b/test/runner/runner_test.dart
@@ -65,6 +65,7 @@
[compact] A single line, updated continuously.
[expanded] A separate line for each update.
+ [json] A machine-readable format (see https://goo.gl/0HRhdZ).
--verbose-trace Whether to emit stack traces with core library frames.
--js-trace Whether to emit raw JavaScript stack traces for browser tests.
