update to M2 of Dart

dzenanr · Jan 23, 2013 · 9f18098 · 9f18098
1 parent e1b7d74
commit 9f18098
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 24 deletions.
diff --git a/educ_memory_game.dart b/educ_memory_game.dart
@@ -1,7 +1,7 @@
 library educ_memory_game;
 
 import 'dart:html';
-import 'dart:isolate';
+import 'dart:async';
 import 'dart:math';
 
 part 'model/cell.dart';

diff --git a/model/cell.dart b/model/cell.dart
@@ -35,8 +35,8 @@ class Cells {
     list.add(cell);
   }
 
-  Iterator iterator() {
-    return list.iterator();
+  Iterator get iterator {
+    return list.iterator;
   }
 
   bool every(Function f) {

diff --git a/model/memory.dart b/model/memory.dart
@@ -56,7 +56,7 @@ class Memory {
     var color;
     do {
       color = randomColor();
-    } while (usedColors.some((c) => c == color));
+    } while (usedColors.any((c) => c == color));
     usedColors.add(color);
     return color;
   }

diff --git a/pubspec.lock b/pubspec.lock
@@ -1 +1 @@
-{"packages":{"browser":{"version":"0.0.1","source":"hosted","description":"browser"}}}
+{"packages":{"browser":{"version":"0.3.1+1","source":"hosted","description":"browser"}}}
diff --git a/spirals/s00/pubspec.lock b/spirals/s00/pubspec.lock
@@ -1 +1 @@
-{"packages":{"browser":{"version":"0.0.1","source":"hosted","description":"browser"}}}
+{"packages":{"browser":{"version":"0.3.1+1","source":"hosted","description":"browser"}}}
diff --git a/spirals/s01/educ_memory_game.dart b/spirals/s01/educ_memory_game.dart
@@ -1,7 +1,7 @@
 library memory;
 
 import 'dart:html';
-import 'dart:isolate';
+import 'dart:async';
 
 part 'board.dart';
 

diff --git a/spirals/s01/pubspec.lock b/spirals/s01/pubspec.lock
@@ -1 +1 @@
-{"packages":{"browser":{"version":"0.0.1","source":"hosted","description":"browser"}}}
+{"packages":{"browser":{"version":"0.3.1+1","source":"hosted","description":"browser"}}}
diff --git a/spirals/s02/educ_memory_game.dart b/spirals/s02/educ_memory_game.dart
@@ -1,7 +1,7 @@
 library memory;
 
 import 'dart:html';
-import 'dart:isolate';
+import 'dart:async';
 
 part 'model/memory.dart';
 part 'view/board.dart';

diff --git a/spirals/s02/pubspec.lock b/spirals/s02/pubspec.lock
@@ -1 +1 @@
-{"packages":{"browser":{"version":"0.0.1","source":"hosted","description":"browser"}}}
+{"packages":{"browser":{"version":"0.3.1+1","source":"hosted","description":"browser"}}}
diff --git a/spirals/s03/educ_memory_game.dart b/spirals/s03/educ_memory_game.dart
@@ -1,7 +1,7 @@
 library memory;
 
 import 'dart:html' ;
-import 'dart:isolate';
+import 'dart:async';
 import 'dart:math' ;
 
 part 'model/cell.dart';

diff --git a/spirals/s03/model/cell.dart b/spirals/s03/model/cell.dart
@@ -24,8 +24,8 @@ class Cells {
     list.add(cell);
   }
 
-  Iterator iterator() {
-    return list.iterator();
+  Iterator get iterator {
+    return list.iterator;
   }
 
 }
diff --git a/spirals/s03/pubspec.lock b/spirals/s03/pubspec.lock
@@ -1 +1 @@
-{"packages":{"browser":{"version":"0.0.1","source":"hosted","description":"browser"}}}
+{"packages":{"browser":{"version":"0.3.1+1","source":"hosted","description":"browser"}}}
diff --git a/spirals/s04/educ_memory_game.dart b/spirals/s04/educ_memory_game.dart
@@ -1,7 +1,7 @@
 library memory;
 
 import 'dart:html';
-import 'dart:isolate';
+import 'dart:async';
 import 'dart:math';
 
 part 'model/cell.dart';

diff --git a/spirals/s04/model/cell.dart b/spirals/s04/model/cell.dart
@@ -33,8 +33,8 @@ class Cells {
     list.add(cell);
   }
 
-  Iterator iterator() {
-    return list.iterator();
+  Iterator get iterator {
+    return list.iterator;
   }
 
 }
diff --git a/spirals/s04/model/memory.dart b/spirals/s04/model/memory.dart
@@ -56,7 +56,7 @@ class Memory {
     var color;
     do {
       color = randomColor();
-    } while (usedColors.some((c) => c == color));
+    } while (usedColors.any((c) => c == color));
     usedColors.add(color);
     return color;
   }

diff --git a/spirals/s04/pubspec.lock b/spirals/s04/pubspec.lock
@@ -1 +1 @@
-{"packages":{"browser":{"version":"0.0.1","source":"hosted","description":"browser"}}}
+{"packages":{"browser":{"version":"0.3.1+1","source":"hosted","description":"browser"}}}
diff --git a/spirals/s05/educ_memory_game.dart b/spirals/s05/educ_memory_game.dart
@@ -1,7 +1,7 @@
 library memory;
 
 import 'dart:html';
-import 'dart:isolate';
+import 'dart:async';
 import 'dart:math';
 
 part 'model/cell.dart';

diff --git a/spirals/s05/model/cell.dart b/spirals/s05/model/cell.dart
@@ -35,8 +35,8 @@ class Cells {
     list.add(cell);
   }
 
-  Iterator iterator() {
-    return list.iterator();
+  Iterator get iterator {
+    return list.iterator;
   }
 
   bool every(Function f) {

diff --git a/spirals/s05/model/memory.dart b/spirals/s05/model/memory.dart
@@ -56,7 +56,7 @@ class Memory {
     var color;
     do {
       color = randomColor();
-    } while (usedColors.some((c) => c == color));
+    } while (usedColors.any((c) => c == color));
     usedColors.add(color);
     return color;
   }

diff --git a/spirals/s05/pubspec.lock b/spirals/s05/pubspec.lock
@@ -1 +1 @@
-{"packages":{"browser":{"version":"0.0.1","source":"hosted","description":"browser"}}}
+{"packages":{"browser":{"version":"0.3.1+1","source":"hosted","description":"browser"}}}