Using async/await, require Dart 1.9, use latest StageXL

Author: kevmoo

lib/platform_target.dart

@@ -42,15 +42,13 @@ class _DefaultPlatform extends PlatformTarget {
   _DefaultPlatform() : super.base();
 
   @override
-  Future clearValues() => new Future(_values.clear);
+  Future clearValues() async => _values.clear();
 
   @override
-  Future setValue(String key, String value) => new Future(() {
-    _values[key] = value;
-  });
+  Future setValue(String key, String value) async => _values[key] = value;
 
   @override
-  Future<String> getValue(String key) => new Future(() => _values[key]);
+  Future<String> getValue(String key) async => _values[key];
 
   int get size => 7;
 

lib/pop_pop_win.dart

@@ -15,7 +15,7 @@ import 'src/stage.dart';
 
 const String _ASSET_DIR = 'packages/pop_pop_win/assets';
 
-Future startGame(PlatformTarget platform) {
+Future startGame(PlatformTarget platform) async {
   initPlatform(platform);
 
   var stage = new Stage(querySelector('#gameCanvas'),
@@ -30,7 +30,8 @@ Future startGame(PlatformTarget platform) {
     ..addTextureAtlas(
         "static", '$_ASSET_DIR/images/static.json', TextureAtlasFormat.JSON);
 
-  return resourceManager.load().then((resMan) => _initialLoad(resMan, stage));
+  var resMan = await resourceManager.load();
+  _initialLoad(resMan, stage);
 }
 
 void _initialLoad(ResourceManager resourceManager, Stage stage) {

lib/src/game_storage.dart

@@ -54,16 +54,15 @@ class GameStorage {
     return targetPlatform.clearValues();
   }
 
-  Future<int> _getIntValue(String key, [int defaultValue = 0]) {
+  Future<int> _getIntValue(String key, [int defaultValue = 0]) async {
     assert(key != null);
     if (_cache.containsKey(key)) {
       return new Future.value(_parseValue(_cache[key], defaultValue));
     }
 
-    return targetPlatform.getValue(key).then((String strValue) {
-      _cache[key] = strValue;
-      return _parseValue(strValue, defaultValue);
-    });
+    var strValue = await targetPlatform.getValue(key);
+    _cache[key] = strValue;
+    return _parseValue(strValue, defaultValue);
   }
 
   Future _setIntValue(String key, int value) {
@@ -73,10 +72,9 @@ class GameStorage {
     return targetPlatform.setValue(key, val);
   }
 
-  Future _incrementIntValue(String key) {
-    return _getIntValue(key).then((int val) {
-      return _setIntValue(key, val + 1);
-    });
+  Future _incrementIntValue(String key) async {
+    var val = await _getIntValue(key);
+    return _setIntValue(key, val + 1);
   }
 
   static String _getKey(int w, int h, int m) => "w$w-h$h-m$m";

pubspec.yaml

@@ -3,11 +3,11 @@ author: Dart Team <misc@dartlang.org>
 description: '"Pop, Pop, Win!" is an implementation of Minesweeper in Dart.'
 homepage: https://github.com/dart-lang/sample-pop_pop_win
 environment:
-  sdk: '>=1.3.0 <2.0.0'
+  sdk: '>=1.9.0 <2.0.0'
 dependencies:
-  bot: '>=0.26.0 <0.29.0'
-  browser: '>=0.10.0 <0.11.0'
-  chrome: '>=0.6.3 <0.7.0'
-  stagexl: '>=0.9.1 <0.11.0'
+  bot: '^0.28.0'
+  browser: '^0.10.0'
+  chrome: '^0.6.3'
+  stagexl: '^0.11.0'
 dev_dependencies:
-  unittest: '>=0.10.0 <0.12.0'
+  unittest: '^0.11.0'

web/platform_web.dart

@@ -18,20 +18,14 @@ class PlatformWeb extends PlatformTarget {
   }
 
   @override
-  Future clearValues() {
-    window.localStorage.clear();
-    return new Future.value();
-  }
+  Future clearValues() async => window.localStorage.clear();
 
   @override
-  Future setValue(String key, String value) {
-    window.localStorage[key] = value;
-    return new Future.value();
-  }
+  Future setValue(String key, String value) async =>
+      window.localStorage[key] = value;
 
   @override
-  Future<String> getValue(String key) =>
-      new Future.value(window.localStorage[key]);
+  Future<String> getValue(String key) async => window.localStorage[key];
 
   int get size {
     _sizeAccessed = true;