Beta branch fix (#173)

2025-11-08 13:58:47 +00:00 · 2019-12-12 05:01:45 +11:00
parent 6673acc6d7
commit 73086e20c1
28 changed files with 702 additions and 94 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
 **/doc/api/
 .dart_tool/
 .flutter-plugins
+.flutter-plugins-dependencies
 .packages
 .pub-cache/
 .pub/
@@ -34,7 +35,7 @@
 **/android/gradlew
 **/android/gradlew.bat
 **/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
+**/android/**/GeneratedPluginRegistrant.*

 # iOS/XCode related
 **/ios/**/*.mode1v3
@@ -62,6 +63,9 @@
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*

+# Web related
+**/web/**/lib/generated_plugin_registrant.dart
+
 # Exceptions to above rules.
 !**/ios/**/default.mode1v3
 !**/ios/**/default.mode2v3
--- a/animations/pubspec.lock
+++ b/animations/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -29,13 +43,27 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
  cupertino_icons:
    dependency: "direct main"
    description:
      name: cupertino_icons
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.1.2"
+    version: "0.1.3"
  flutter:
    dependency: "direct main"
    description: flutter
@@ -46,20 +74,27 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -74,6 +109,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  quiver:
    dependency: transitive
    description:
@@ -127,7 +169,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -142,5 +184,12 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
--- a/chrome-os-best-practices/pubspec.lock
+++ b/chrome-os-best-practices/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -29,6 +43,20 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -46,20 +74,27 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -74,6 +109,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  quiver:
    dependency: transitive
    description:
@@ -127,7 +169,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -142,5 +184,12 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
--- a/flutter_maps_firestore/pubspec.lock
+++ b/flutter_maps_firestore/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -36,6 +50,20 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
  firebase_core:
    dependency: transitive
    description:
@@ -88,6 +116,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "3.1.3"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  location:
    dependency: "direct main"
    description:
@@ -101,14 +136,14 @@ packages:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -123,6 +158,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  quiver:
    dependency: transitive
    description:
@@ -183,7 +225,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -198,6 +240,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
  flutter: ">=1.9.1+hotfix.5 <2.0.0"
--- a/isolate_example/pubspec.lock
+++ b/isolate_example/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -29,6 +43,20 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
  flutter:
    dependency: "direct main"
    description: flutter
@@ -39,20 +67,27 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -67,6 +102,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  provider:
    dependency: "direct main"
    description:
@@ -127,7 +169,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -142,5 +184,12 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
--- a/jsonexample/pubspec.lock
+++ b/jsonexample/pubspec.lock
@@ -15,6 +15,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.2.1"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
  args:
    dependency: transitive
    description:
@@ -28,7 +35,7 @@ packages:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -221,6 +228,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "3.1.3"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  io:
    dependency: transitive
    description:
@@ -269,14 +283,14 @@ packages:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  mime:
    dependency: transitive
    description:
@@ -326,6 +340,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  pool:
    dependency: transitive
    description:
@@ -428,7 +449,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  timing:
    dependency: transitive
    description:
@@ -464,6 +485,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
  yaml:
    dependency: transitive
    description:
--- a/material_studies/rally/pubspec.lock
+++ b/material_studies/rally/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -29,6 +43,20 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -46,6 +74,13 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  intl:
    dependency: "direct main"
    description:
@@ -59,14 +94,14 @@ packages:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -81,6 +116,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  quiver:
    dependency: transitive
    description:
@@ -134,7 +176,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -149,5 +191,12 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
--- a/material_studies/shrine/lib/expanding_bottom_sheet.dart
+++ b/material_studies/shrine/lib/expanding_bottom_sheet.dart
@@ -51,9 +51,8 @@ class ExpandingBottomSheet extends StatefulWidget {
      {bool isNullOk = false}) {
    assert(isNullOk != null);
    assert(context != null);
-    final _ExpandingBottomSheetState result = context.ancestorStateOfType(
-            const TypeMatcher<_ExpandingBottomSheetState>())
-        as _ExpandingBottomSheetState;
+    final _ExpandingBottomSheetState result =
+        context.findAncestorStateOfType<_ExpandingBottomSheetState>();
    if (isNullOk || result != null) {
      return result;
    }
--- a/material_studies/shrine/pubspec.lock
+++ b/material_studies/shrine/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -29,6 +43,20 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -46,6 +74,13 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  intl:
    dependency: "direct main"
    description:
@@ -59,14 +94,14 @@ packages:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -81,6 +116,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  quiver:
    dependency: transitive
    description:
@@ -148,7 +190,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -163,5 +205,12 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
--- a/place_tracker/lib/app_model.dart
+++ b/place_tracker/lib/app_model.dart
@@ -26,19 +26,15 @@ class AppModel<T> extends StatefulWidget {

  _AppModelState<T> createState() => _AppModelState<T>();

-  static Type _typeOf<T>() => T;
-
  static T of<T>(BuildContext context) {
-    final Type appModelScopeType = _typeOf<_AppModelScope<T>>();
-    final _AppModelScope<T> scope = context
-        .inheritFromWidgetOfExactType(appModelScopeType) as _AppModelScope<T>;
+    final _AppModelScope<T> scope =
+        context.dependOnInheritedWidgetOfExactType<_AppModelScope<T>>();
    return scope.appModelState.currentState;
  }

  static void update<T>(BuildContext context, T newState) {
-    final Type appModelScopeType = _typeOf<_AppModelScope<T>>();
-    final _AppModelScope<T> scope = context
-        .inheritFromWidgetOfExactType(appModelScopeType) as _AppModelScope<T>;
+    final _AppModelScope<T> scope =
+        context.dependOnInheritedWidgetOfExactType<_AppModelScope<T>>();
    scope.appModelState.updateState(newState);
  }
 }
--- a/place_tracker/pubspec.lock
+++ b/place_tracker/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -67,20 +81,27 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.4.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -95,6 +116,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  quiver:
    dependency: transitive
    description:
@@ -148,7 +176,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -170,6 +198,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
  flutter: ">=0.11.9 <2.0.0"
--- a/platform_design/pubspec.lock
+++ b/platform_design/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -29,6 +43,20 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -60,20 +88,27 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -88,6 +123,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  quiver:
    dependency: transitive
    description:
@@ -141,7 +183,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -156,5 +198,12 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
--- a/platform_view_swift/pubspec.lock
+++ b/platform_view_swift/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -29,6 +43,20 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -46,20 +74,27 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -74,6 +109,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  quiver:
    dependency: transitive
    description:
@@ -127,7 +169,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -142,5 +184,12 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
--- a/provider_counter/pubspec.lock
+++ b/provider_counter/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -29,6 +43,20 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -46,20 +74,27 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -74,6 +109,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  provider:
    dependency: "direct main"
    description:
@@ -134,7 +176,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -149,5 +191,12 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
--- a/provider_shopper/pubspec.lock
+++ b/provider_shopper/pubspec.lock
@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -29,6 +43,20 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
  flutter:
    dependency: "direct main"
    description: flutter
@@ -39,20 +67,27 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -67,6 +102,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  provider:
    dependency: "direct main"
    description:
@@ -127,7 +169,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
@@ -142,5 +184,12 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
  dart: ">=2.5.0 <3.0.0"
--- a/veggieseasons/pubspec.lock
+++ b/veggieseasons/pubspec.lock
@@ -21,7 +21,7 @@ packages:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -94,7 +94,7 @@ packages:
      name: image
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.9"
+    version: "2.1.4"
  intl:
    dependency: "direct main"
    description:
@@ -108,14 +108,14 @@ packages:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
@@ -204,7 +204,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  typed_data:
    dependency: transitive
    description:
--- a/web/charts/pubspec.lock
+++ b/web/charts/pubspec.lock
@@ -47,7 +47,7 @@ packages:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
--- a/web/dad_jokes/pubspec.lock
+++ b/web/dad_jokes/pubspec.lock
@@ -47,7 +47,7 @@ packages:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
--- a/web/filipino_cuisine/pubspec.lock
+++ b/web/filipino_cuisine/pubspec.lock
@@ -61,7 +61,7 @@ packages:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
--- a/web/gallery/lib/demo/material/drawer_demo.dart
+++ b/web/gallery/lib/demo/material/drawer_demo.dart
@@ -64,6 +64,7 @@ class _DrawerDemoState extends State<DrawerDemo> with TickerProviderStateMixin {
      case TargetPlatform.fuchsia:
        return Icons.arrow_back;
      case TargetPlatform.iOS:
+      case TargetPlatform.macOS:
        return Icons.arrow_back_ios;
    }
    assert(false);
--- a/web/gallery/lib/gallery/options.dart
+++ b/web/gallery/lib/gallery/options.dart
@@ -359,6 +359,7 @@ class _PlatformItem extends StatelessWidget {
      case TargetPlatform.fuchsia:
        return 'Fuchsia';
      case TargetPlatform.iOS:
+      case TargetPlatform.macOS:
        return 'Cupertino';
    }
    assert(false);
--- a/web/gallery/pubspec.lock
+++ b/web/gallery/pubspec.lock
@@ -131,7 +131,7 @@ packages:
  flutter_goldens_client:
    dependency: transitive
    description:
-      path: "../../../flutter/packages/flutter_goldens_client"
+      path: "../../../../../flutter/packages/flutter_goldens_client"
      relative: true
    source: path
    version: "0.0.0"
@@ -140,6 +140,11 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
  front_end:
    dependency: "direct dev"
    description:
@@ -506,7 +511,21 @@ packages:
      name: video_player
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.10.2+5"
+    version: "0.10.4+1"
+  video_player_platform_interface:
+    dependency: transitive
+    description:
+      name: video_player_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.4"
+  video_player_web:
+    dependency: "direct main"
+    description:
+      name: video_player_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.0"
  vm_service:
    dependency: "direct dev"
    description:
@@ -551,4 +570,4 @@ packages:
    version: "2.2.0"
 sdks:
  dart: ">=2.4.0 <3.0.0"
-  flutter: ">=1.9.1+hotfix.4 <2.0.0"
+  flutter: ">=1.10.0 <2.0.0"
--- a/web/github_dataviz/pubspec.lock
+++ b/web/github_dataviz/pubspec.lock
@@ -54,7 +54,7 @@ packages:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  path:
    dependency: transitive
    description:
--- a/web/particle_background/pubspec.lock
+++ b/web/particle_background/pubspec.lock
@@ -19,7 +19,7 @@ packages:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  sky_engine:
    dependency: transitive
    description: flutter
--- a/web/slide_puzzle/pubspec.lock
+++ b/web/slide_puzzle/pubspec.lock
@@ -8,6 +8,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.36.4"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
  args:
    dependency: transitive
    description:
@@ -21,7 +28,7 @@ packages:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -50,6 +57,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.1.1"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.13.3+3"
  crypto:
    dependency: transitive
    description:
@@ -116,6 +130,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "3.1.3"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
  io:
    dependency: transitive
    description:
@@ -130,13 +151,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.6.1+1"
-  json_rpc_2:
-    dependency: transitive
-    description:
-      name: json_rpc_2
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
  kernel:
    dependency: transitive
    description:
@@ -144,20 +158,27 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.3.19"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.11.3+2"
  matcher:
    dependency: transitive
    description:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  mime:
    dependency: transitive
    description:
@@ -221,6 +242,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
  pool:
    dependency: transitive
    description:
@@ -330,21 +358,21 @@ packages:
      name: test
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.6.3"
+    version: "1.9.4"
  test_api:
    dependency: transitive
    description:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
  test_core:
    dependency: transitive
    description:
      name: test_core
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.5"
+    version: "0.2.15"
  typed_data:
    dependency: transitive
    description:
@@ -359,13 +387,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.8"
-  vm_service_client:
+  vm_service:
    dependency: transitive
    description:
-      name: vm_service_client
+      name: vm_service
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.6+3"
+    version: "2.1.3"
  watcher:
    dependency: transitive
    description:
@@ -380,6 +408,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
  yaml:
    dependency: transitive
    description:
@@ -388,4 +423,4 @@ packages:
    source: hosted
    version: "2.2.0"
 sdks:
-  dart: ">=2.3.0 <3.0.0"
+  dart: ">=2.4.0 <3.0.0"
--- a/web/spinning_square/pubspec.lock
+++ b/web/spinning_square/pubspec.lock
@@ -19,7 +19,7 @@ packages:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  sky_engine:
    dependency: transitive
    description: flutter
--- a/web/timeflow/pubspec.lock
+++ b/web/timeflow/pubspec.lock
@@ -19,7 +19,7 @@ packages:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  sky_engine:
    dependency: transitive
    description: flutter
--- a/web/vision_challenge/pubspec.lock
+++ b/web/vision_challenge/pubspec.lock
@@ -26,7 +26,7 @@ packages:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
  redux:
    dependency: "direct main"
    description: