fix(key): made Key part of di.dart again

dart-archive · Apr 19, 2014 · fe390dd · fe390dd
1 parent 09a3747
commit fe390dd
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 9 deletions.
diff --git a/lib/di.dart b/lib/di.dart
@@ -1,9 +1,9 @@
 library di;
 
 import 'src/provider.dart';
-import 'key.dart';
 
 part 'src/injector.dart';
 part 'src/module.dart';
 part 'src/errors.dart';
+part 'src/key.dart';
 
diff --git a/lib/dynamic_injector.dart b/lib/dynamic_injector.dart
@@ -1,7 +1,6 @@
 library di.dynamic_injector;
 
 import 'di.dart';
-import 'key.dart';
 import 'src/mirrors.dart';
 import 'src/base_injector.dart';
 import 'src/error_helper.dart';

diff --git a/lib/src/base_injector.dart b/lib/src/base_injector.dart
@@ -4,7 +4,6 @@ import 'provider.dart';
 import 'error_helper.dart';
 
 import 'package:collection/collection.dart';
-import 'package:di/key.dart';
 import 'package:di/di.dart';
 
 List<Key> _PRIMITIVE_TYPES = new UnmodifiableListView(<Key>[

diff --git a/lib/src/error_helper.dart b/lib/src/error_helper.dart
@@ -1,6 +1,6 @@
 library di.error_helper;
 
-import 'package:di/key.dart';
+import 'package:di/di.dart';
 
 String error(List resolving, message, [appendDependency]) {
   if (appendDependency != null) {

diff --git a/lib/src/injector_delagate.dart b/lib/src/injector_delagate.dart
@@ -2,7 +2,6 @@ library di.injector_delegate;
 
 import 'base_injector.dart';
 import 'package:di/di.dart';
-import 'package:di/key.dart';
 
 class InjectorDelagate implements Injector, ObjectFactory {
   BaseInjector _injector;

diff --git a/lib/key.dart → lib/src/key.dart b/lib/key.dart → lib/src/key.dart
@@ -1,4 +1,4 @@
-library di.key;
+part of di;
 
 int _lastKeyId = 0;
 int get lastKeyId => _lastKeyId;

diff --git a/lib/static_injector.dart b/lib/static_injector.dart
@@ -1,7 +1,6 @@
 library di.static_injector;
 
 import 'di.dart';
-import 'key.dart';
 import 'src/error_helper.dart';
 import 'src/base_injector.dart';
 

diff --git a/test/main.dart b/test/main.dart
@@ -13,7 +13,6 @@ library di.tests;
 
 import 'fixed-unittest.dart';
 import 'package:di/di.dart';
-import 'package:di/key.dart';
 import 'package:di/dynamic_injector.dart';
 import 'package:di/static_injector.dart';
 import 'package:di/annotations.dart';
@@ -567,7 +566,7 @@ createInjectorSpec(String injectorName, InjectorFactory injectorFactory) {
     });
 
 
-    iit('should instantiate class only once (Issue #18)', () {
+    it('should instantiate class only once (Issue #18)', () {
       var rootInjector = injectorFactory([]);
       var injector = rootInjector.createChild([
           new Module()