Merge pull request #47 from dart-lang/dart2
dart2 fixes
diff --git a/.travis.yml b/.travis.yml
index 24d56a3..655bf3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@
sudo: false
dart:
- dev
- - stable
dart_task:
- test
- dartfmt
diff --git a/pubspec.yaml b/pubspec.yaml
index bd2c6ab..56d44f5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,11 +5,11 @@
homepage: https://github.com/dart-lang/package_config
environment:
- sdk: '>=1.11.0 <2.0.0'
+ sdk: '>=2.0.0-dev <2.0.0'
dependencies:
charcode: ^1.1.0
path: ^1.0.0
dev_dependencies:
- test: ^0.12.0
+ test: ^1.0.0
diff --git a/test/discovery_test.dart b/test/discovery_test.dart
index 6a5bcde..2c60db3 100644
--- a/test/discovery_test.dart
+++ b/test/discovery_test.dart
@@ -289,7 +289,7 @@
if (path.startsWith('/')) path = path.substring(1);
if (path.endsWith('/')) path = path.substring(0, path.length - 1);
var parts = path.split('/');
- var fileOrDir = description;
+ dynamic fileOrDir = description;
for (int i = 0; i < parts.length; i++) {
fileOrDir = fileOrDir[parts[i]];
if (fileOrDir == null) {
