Merge pull request #40 from dart-lang/deferred-loading
updates to make deferred loading work in the vm
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b8d4c1..c503c21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.1+1
+
+* Update to work with deferred loaded libararies in reflective mode, (but not
+yet in the transformer).
+
## 0.6.1
* Update to analyzer `<=0.26.0`.
diff --git a/lib/src/mirror_loader.dart b/lib/src/mirror_loader.dart
index 3865e72..4ca2004 100644
--- a/lib/src/mirror_loader.dart
+++ b/lib/src/mirror_loader.dart
@@ -100,7 +100,8 @@
// First visit all our dependencies.
for (var dependency in lib.libraryDependencies) {
// Skip dart: imports, they never use this package.
- if (dependency.targetLibrary.uri.toString().startsWith('dart:')) continue;
+ var targetLibrary = dependency.targetLibrary;
+ if (targetLibrary == null || targetLibrary.uri.scheme == 'dart') continue;
_readLibraryDeclarations(dependency.targetLibrary, librariesSeen, queue);
}
diff --git a/pubspec.yaml b/pubspec.yaml
index 4454681..6bc4e74 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: initialize
-version: 0.6.1
+version: 0.6.1+1
author: Polymer.dart Authors <web@dartlang.org>
description: Generic building blocks for doing static initialization.
homepage: https://github.com/dart-lang/initialize
