From 13389c03f6a26640f61131f17d718d1af0158ee3 Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@users.noreply.github.com>
Date: Fri, 2 Feb 2018 14:58:21 -0800
Subject: [PATCH] Support latest analyzer and async packages (#666)

---
 pubspec.lock | 30 +++++++++++++++---------------
 pubspec.yaml |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 9173b311..1c02112c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,28 +7,28 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.30.0+4"
+    version: "0.31.0"
   args:
     dependency: "direct main"
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   async:
     dependency: "direct dev"
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.3"
   barback:
     dependency: transitive
     description:
       name: barback
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.15.2+13"
+    version: "0.15.2+14"
   boolean_selector:
     dependency: transitive
     description:
@@ -91,7 +91,7 @@ packages:
       name: front_end
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.0-alpha.4.1"
+    version: "0.1.0-alpha.8"
   glob:
     dependency: transitive
     description:
@@ -112,7 +112,7 @@ packages:
       name: html
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.2+1"
+    version: "0.13.2+2"
   http:
     dependency: transitive
     description:
@@ -140,7 +140,7 @@ packages:
       name: io
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.1"
+    version: "0.3.2+1"
   isolate:
     dependency: transitive
     description:
@@ -161,7 +161,7 @@ packages:
       name: kernel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0-alpha.1.1"
+    version: "0.3.0-alpha.5"
   logging:
     dependency: transitive
     description:
@@ -189,7 +189,7 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.5"
+    version: "0.9.6"
   multi_server_socket:
     dependency: transitive
     description:
@@ -252,7 +252,7 @@ packages:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.1"
+    version: "0.7.2"
   shelf_packages_handler:
     dependency: transitive
     description:
@@ -266,7 +266,7 @@ packages:
       name: shelf_static
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.6"
+    version: "0.2.7"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -329,7 +329,7 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.30"
+    version: "0.12.30+1"
   test_descriptor:
     dependency: "direct dev"
     description:
@@ -357,14 +357,14 @@ packages:
       name: utf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.0+3"
+    version: "0.9.0+4"
   watcher:
     dependency: transitive
     description:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.7+4"
+    version: "0.9.7+7"
   web_socket_channel:
     dependency: transitive
     description:
@@ -380,4 +380,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=1.23.0 <=2.0.0-edge.d5105da9cabff92c398d90d7c80fc23b5e38e012"
+  dart: "2.0.0-dev.20.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index d1f98216..0d9467f7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,18 +1,18 @@
 name: dart_style
 # Note: See tool/grind.dart for how to bump the version.
-version: 1.0.9
+version: 1.0.9+1
 author: Dart Team <misc@dartlang.org>
 description: Opinionated, automatic Dart source code formatter.
 homepage: https://github.com/dart-lang/dart_style
 environment:
   sdk: ">=1.8.0 <2.0.0"
 dependencies:
-  analyzer: '^0.30.0'
+  analyzer: '>=0.30.0 <0.32.0'
   args: '>=0.12.1 <2.0.0'
   path: '>=1.0.0 <2.0.0'
   source_span: '>=1.4.0 <2.0.0'
 dev_dependencies:
-  async: '>=1.0.0 <=2.0.0'
+  async: '>=1.0.0 <=3.0.0'
   browser: '>=0.10.0 <0.11.0'
   grinder: '^0.8.0'
   js: ^0.6.0