commit 26798c36fa6b89bd9fba89b163d56da6e438c041
author Natalie Weizenbaum <nweiz@google.com> Wed May 30 16:52:41 2018 -0400
committer GitHub <noreply@github.com> Wed May 30 16:52:41 2018 -0400
tree bd3e942ed2781dbaebffadbb24e6229a5deec937
parent ce0f41eba9ba9e50500a7ffec373061cfc0edc76
parent 85fdeb8e9345c3d51bc34d4d650f1e09041cf554

Merge pull request #14 from dart-lang/dart-2

Fix Dart 2 runtime errors in tests

pubspec.yaml

diff --git a/pubspec.yaml b/pubspec.yaml
index b2048cf..8aa5b72 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,11 @@
 name: package_resolver
-version: 1.0.3
+version: 1.0.4-dev
 description: First-class package resolution strategy classes.
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/package_resolver
 
 environment:
-  sdk: '>=2.0.0-dev.17.0 <2.0.0'
+  sdk: '>=2.0.0-dev.37.0 <2.0.0'
 
 dependencies:
   collection: '^1.9.0'
@@ -13,6 +13,6 @@
   package_config: '>=0.1.0 <2.0.0'
   path: '^1.0.0'
 dev_dependencies:
-  shelf: '^0.6.0'
+  shelf: '^0.7.0'
   test: '^0.12.0'
   stack_trace: '^1.9.2'

test/current_isolate_info_test.dart

diff --git a/test/current_isolate_info_test.dart b/test/current_isolate_info_test.dart
index b554794..4891bc9 100644
--- a/test/current_isolate_info_test.dart
+++ b/test/current_isolate_info_test.dart
@@ -36,7 +36,7 @@
       var map;
       var currentIsolateMap = await PackageResolver.current.packageConfigMap;
       if (currentIsolateMap != null) {
-        map = new Map.from(currentIsolateMap);
+        map = new Map.of(currentIsolateMap);
       } else {
         // If the isolate running this test isn't using package config, create
         // one from scratch with the same resolution semantics.