Lands beta branch into master for 2.5 (#895)

experimental/web_dashboard/lib/src/auth/firebase.dart

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:firebase_auth/firebase_auth.dart' hide FirebaseUser;
 import 'package:flutter/services.dart';
 import 'package:google_sign_in/google_sign_in.dart';
-import 'package:firebase_auth/firebase_auth.dart' hide FirebaseUser;
 
 import 'auth.dart';
 

experimental/web_dashboard/lib/src/pages/entries.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 import 'package:intl/intl.dart' as intl;
+import 'package:provider/provider.dart';
 
 import '../api/api.dart';
 import '../app.dart';

experimental/web_dashboard/lib/src/widgets/category_chart.dart

@@ -2,9 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:flutter/material.dart';
-
 import 'package:charts_flutter/flutter.dart' as charts;
+import 'package:flutter/material.dart';
 import 'package:intl/intl.dart' as intl;
 
 import '../api/api.dart';

experimental/web_dashboard/lib/src/widgets/edit_entry.dart

@@ -3,9 +3,9 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart' as intl;
 import 'package:provider/provider.dart';
 import 'package:web_dashboard/src/api/api.dart';
-import 'package:intl/intl.dart' as intl;
 
 import '../app.dart';
 import 'categories_dropdown.dart';

experimental/web_dashboard/pubspec.lock

@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -105,21 +105,23 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   charts_common:
     dependency: transitive
     description:
       name: charts_common
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.0"
+    version: "0.11.0"
   charts_flutter:
     dependency: "direct main"
     description:
-      name: charts_flutter
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.9.0"
+      path: charts_flutter
+      ref: HEAD
+      resolved-ref: "30477090290b348ed3101bc13017aae465f59017"
+      url: "git://github.com/google/charts.git"
+    source: git
+    version: "0.11.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -365,7 +367,7 @@ packages:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.1"
+    version: "0.17.0"
   io:
     dependency: transitive
     description:
@@ -421,7 +423,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   mime:
     dependency: transitive
     description:
@@ -594,7 +596,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.2"
   timing:
     dependency: transitive
     description:

experimental/web_dashboard/pubspec.yaml

@@ -1,6 +1,7 @@
 name: web_dashboard
 description: A dashboard app sample
 version: 1.0.0+1
+publish_to: none
 environment:
   sdk: ">=2.6.0 <3.0.0"
 dependencies:
@@ -14,7 +15,10 @@ dependencies:
   json_annotation: ^3.0.0
   provider: ^4.0.0
   uuid: ^2.0.0
-  charts_flutter: ^0.9.0
+  charts_flutter:
+    git:
+      url: git://github.com/google/charts.git
+      path: charts_flutter
 dev_dependencies:
   flutter_test:
     sdk: flutter

experimental/web_dashboard/tool/grind.dart

@@ -3,9 +3,9 @@
 // BSD-style license that can be found in the LICENSE file.
 import 'dart:convert';
 import 'dart:io';
-import 'package:path/path.dart' as path;
 
 import 'package:grinder/grinder.dart';
+import 'package:path/path.dart' as path;
 
 void main(List<String> args) => grind(args);