Commit 1fe118fe authored by Phil Quitslund's avatar Phil Quitslund Committed by GitHub

Merge pull request #5076 from pq/dart_1.19.0-dev.0.0

Update Dart (1.19.0-dev.0.0) and analyzer (0.27.4-alpha.19).
parents 78126b55 280caba4
......@@ -2,7 +2,7 @@ name: flutter_gallery
dependencies:
intl: '>=0.12.4+2 <0.13.0'
collection: '>=1.4.0 <2.0.0'
string_scanner: '^0.1.5'
string_scanner: ^1.0.0
flutter:
path: ../../packages/flutter
......
......@@ -20,6 +20,6 @@ dependencies:
path: '../flutter_test'
dev_dependencies:
test: 0.12.13+5
test: 0.12.15+1
mockito: '^0.11.0'
quiver: '^0.21.4'
......@@ -8,7 +8,7 @@ dependencies:
flutter:
path: ../flutter
markdown: '^0.9.0'
string_scanner: '^0.1.5'
string_scanner: ^1.0.0
dev_dependencies:
flutter_test:
......
......@@ -5,12 +5,12 @@ dependencies:
# The flutter tools depend on very specific internal implementation
# details of the 'test' package, which change between versions, so
# here we pin it precisely to avoid version skew across our packages.
test: 0.12.13+5
test: 0.12.15+1
# We don't actually depend on 'analyzer', but 'test' and 'flutter_tools' do.
# We pin the version of analyzer we depend on to avoid version skew across our
# packages.
analyzer: 0.27.4-alpha.16
analyzer: 0.27.4-alpha.19
flutter:
path: ../flutter
......@@ -48,7 +48,7 @@ class TestCommand extends FlutterCommand {
bool get requiresProjectRoot => false;
@override
Validator projectRootValidator = () {
Validator commandValidator = () {
if (!FileSystemEntity.isFileSync('pubspec.yaml')) {
printError(
'Error: No pubspec.yaml file found in the current working directory.\n'
......@@ -150,7 +150,7 @@ class TestCommand extends FlutterCommand {
Future<int> runInProject() async {
List<String> testArgs = argResults.rest.map((String testPath) => path.absolute(testPath)).toList();
if (!projectRootValidator())
if (!commandValidator())
return 1;
Directory testDir;
......
......@@ -214,7 +214,7 @@ abstract class FlutterCommand extends Command {
Future<int> runInProject();
// This is caculated in run() if the command has [requiresDevice] specified.
// This is calculated in run() if the command has [requiresDevice] specified.
Device _deviceForCommand;
Device get deviceForCommand => _deviceForCommand;
......
......@@ -36,10 +36,10 @@ dependencies:
# We depend on very specific internal implementation details of the
# 'test' package, which change between versions, so here we pin it
# precisely.
test: 0.12.13+5
test: 0.12.15+1
# Pinned in flutter_test as well.
analyzer: 0.27.4-alpha.16
analyzer: 0.27.4-alpha.19
dev_dependencies:
mockito: ^0.11.0
......
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