[roll] Update third-party dart packages

Roller-URL: https://ci.chromium.org/b/8851967166095068400
Cq-Cl-Tag: roller-builder:flutter-with-deps-roller
Cq-Cl-Tag: roller-bid:8851967166095068400
CQ-Do-Not-Cancel-Tryjobs: true
Change-Id: Icd2530c1de070f194e8a276c172f215e318843a5
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/dart-pkg/+/506019
Reviewed-by: GI Roller <global-integration-roller@fuchsia-infra.iam.gserviceaccount.com>
Commit-Queue: GI Roller <global-integration-roller@fuchsia-infra.iam.gserviceaccount.com>
diff --git a/analyzer/BUILD.gn b/analyzer/BUILD.gn
index 75931d6..314e54b 100644
--- a/analyzer/BUILD.gn
+++ b/analyzer/BUILD.gn
@@ -10,20 +10,20 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/convert",
-    "//third_party/dart-pkg/pub/args",
-    "//third_party/dart-pkg/pub/pub_semver",
-    "//third_party/dart-pkg/pub/cli_util",
-    "//third_party/dart-pkg/pub/glob",
-    "//third_party/dart-pkg/pub/package_config",
     "//third_party/dart-pkg/pub/_fe_analyzer_shared",
-    "//third_party/dart-pkg/pub/crypto",
+    "//third_party/dart-pkg/pub/args",
+    "//third_party/dart-pkg/pub/cli_util",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/convert",
+    "//third_party/dart-pkg/pub/crypto",
+    "//third_party/dart-pkg/pub/glob",
+    "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/package_config",
+    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/pub_semver",
+    "//third_party/dart-pkg/pub/source_span",
     "//third_party/dart-pkg/pub/watcher",
     "//third_party/dart-pkg/pub/yaml",
-    "//third_party/dart-pkg/pub/meta",
-    "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/source_span",
   ]
 
   sources = [
diff --git a/archive/BUILD.gn b/archive/BUILD.gn
index 78438b1..62ed5ab 100644
--- a/archive/BUILD.gn
+++ b/archive/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/crypto",
+    "//third_party/dart-pkg/pub/path",
   ]
 
   sources = [
diff --git a/build/BUILD.gn b/build/BUILD.gn
index 1c03fe9..d29dce0 100644
--- a/build/BUILD.gn
+++ b/build/BUILD.gn
@@ -10,13 +10,13 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/convert",
-    "//third_party/dart-pkg/pub/logging",
-    "//third_party/dart-pkg/pub/glob",
-    "//third_party/dart-pkg/pub/crypto",
     "//third_party/dart-pkg/pub/analyzer",
-    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/async",
+    "//third_party/dart-pkg/pub/convert",
+    "//third_party/dart-pkg/pub/crypto",
+    "//third_party/dart-pkg/pub/glob",
+    "//third_party/dart-pkg/pub/logging",
+    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/path",
   ]
 
diff --git a/built_collection/BUILD.gn b/built_collection/BUILD.gn
index cd38ad1..30d3514 100644
--- a/built_collection/BUILD.gn
+++ b/built_collection/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/quiver",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/quiver",
   ]
 
   sources = [
diff --git a/built_value/BUILD.gn b/built_value/BUILD.gn
index fd90089..7d4b203 100644
--- a/built_value/BUILD.gn
+++ b/built_value/BUILD.gn
@@ -11,9 +11,9 @@
 
   deps = [
     "//third_party/dart-pkg/pub/built_collection",
-    "//third_party/dart-pkg/pub/quiver",
-    "//third_party/dart-pkg/pub/fixnum",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/fixnum",
+    "//third_party/dart-pkg/pub/quiver",
   ]
 
   sources = [
diff --git a/checked_yaml/BUILD.gn b/checked_yaml/BUILD.gn
index 59c3dfe..688b6a7 100644
--- a/checked_yaml/BUILD.gn
+++ b/checked_yaml/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/source_span",
     "//third_party/dart-pkg/pub/json_annotation",
+    "//third_party/dart-pkg/pub/source_span",
     "//third_party/dart-pkg/pub/yaml",
   ]
 
diff --git a/cli_util/BUILD.gn b/cli_util/BUILD.gn
index 3ca7b25..c577416 100644
--- a/cli_util/BUILD.gn
+++ b/cli_util/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/path",
   ]
 
   sources = [
diff --git a/code_builder/BUILD.gn b/code_builder/BUILD.gn
index d9c7a10..cf220c9 100644
--- a/code_builder/BUILD.gn
+++ b/code_builder/BUILD.gn
@@ -10,11 +10,11 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/matcher",
     "//third_party/dart-pkg/pub/built_collection",
-    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/built_value",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/matcher",
+    "//third_party/dart-pkg/pub/meta",
   ]
 
   sources = [
diff --git a/completion/BUILD.gn b/completion/BUILD.gn
index 72dd589..7b7871d 100644
--- a/completion/BUILD.gn
+++ b/completion/BUILD.gn
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/args",
     "//third_party/dart-pkg/pub/logging",
+    "//third_party/dart-pkg/pub/path",
   ]
 
   sources = [
diff --git a/coverage/BUILD.gn b/coverage/BUILD.gn
index 982e74e..c5149de 100644
--- a/coverage/BUILD.gn
+++ b/coverage/BUILD.gn
@@ -10,13 +10,13 @@
   disable_analysis = true
 
   deps = [
+    "//third_party/dart-pkg/pub/args",
+    "//third_party/dart-pkg/pub/logging",
+    "//third_party/dart-pkg/pub/package_config",
+    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/source_maps",
     "//third_party/dart-pkg/pub/stack_trace",
-    "//third_party/dart-pkg/pub/package_config",
-    "//third_party/dart-pkg/pub/logging",
     "//third_party/dart-pkg/pub/vm_service",
-    "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/args",
   ]
 
   sources = [
diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn
index 0652028..7a729f3 100644
--- a/crypto/BUILD.gn
+++ b/crypto/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/typed_data",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/typed_data",
   ]
 
   sources = [
diff --git a/dart_style/BUILD.gn b/dart_style/BUILD.gn
index 764340f..1d64d9e 100644
--- a/dart_style/BUILD.gn
+++ b/dart_style/BUILD.gn
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/args",
     "//third_party/dart-pkg/pub/analyzer",
+    "//third_party/dart-pkg/pub/args",
+    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/pub_semver",
     "//third_party/dart-pkg/pub/source_span",
   ]
diff --git a/dds/BUILD.gn b/dds/BUILD.gn
index 39e2065..155ba5c 100644
--- a/dds/BUILD.gn
+++ b/dds/BUILD.gn
@@ -10,17 +10,17 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/pedantic",
-    "//third_party/dart-pkg/pub/shelf_web_socket",
-    "//third_party/dart-pkg/pub/web_socket_channel",
-    "//third_party/dart-pkg/pub/shelf",
-    "//third_party/dart-pkg/pub/meta",
-    "//third_party/dart-pkg/pub/vm_service",
-    "//third_party/dart-pkg/pub/shelf_proxy",
-    "//third_party/dart-pkg/pub/json_rpc_2",
-    "//third_party/dart-pkg/pub/sse",
     "//third_party/dart-pkg/pub/async",
+    "//third_party/dart-pkg/pub/json_rpc_2",
+    "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/pedantic",
+    "//third_party/dart-pkg/pub/shelf",
+    "//third_party/dart-pkg/pub/shelf_proxy",
+    "//third_party/dart-pkg/pub/shelf_web_socket",
+    "//third_party/dart-pkg/pub/sse",
     "//third_party/dart-pkg/pub/stream_channel",
+    "//third_party/dart-pkg/pub/vm_service",
+    "//third_party/dart-pkg/pub/web_socket_channel",
   ]
 
   sources = [
diff --git a/devtools/BUILD.gn b/devtools/BUILD.gn
index f3d59d7..bb72e94 100644
--- a/devtools/BUILD.gn
+++ b/devtools/BUILD.gn
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
+    "//third_party/dart-pkg/pub/devtools_server",
     "//third_party/dart-pkg/pub/devtools_shared",
     "//third_party/dart-pkg/pub/http",
-    "//third_party/dart-pkg/pub/devtools_server",
   ]
 
   sources = [
diff --git a/devtools_server/BUILD.gn b/devtools_server/BUILD.gn
index 75075c3..b4f1d4f 100644
--- a/devtools_server/BUILD.gn
+++ b/devtools_server/BUILD.gn
@@ -10,19 +10,19 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/shelf_static",
-    "//third_party/dart-pkg/pub/intl",
     "//third_party/dart-pkg/pub/args",
-    "//third_party/dart-pkg/pub/http_multi_server",
-    "//third_party/dart-pkg/pub/sse",
-    "//third_party/dart-pkg/pub/meta",
-    "//third_party/dart-pkg/pub/vm_service",
-    "//third_party/dart-pkg/pub/shelf_proxy",
-    "//third_party/dart-pkg/pub/shelf",
-    "//third_party/dart-pkg/pub/usage",
-    "//third_party/dart-pkg/pub/devtools_shared",
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/browser_launcher",
+    "//third_party/dart-pkg/pub/devtools_shared",
+    "//third_party/dart-pkg/pub/intl",
+    "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/sse",
+    "//third_party/dart-pkg/pub/shelf",
+    "//third_party/dart-pkg/pub/shelf_proxy",
+    "//third_party/dart-pkg/pub/shelf_static",
+    "//third_party/dart-pkg/pub/http_multi_server",
+    "//third_party/dart-pkg/pub/usage",
+    "//third_party/dart-pkg/pub/vm_service",
   ]
 
   sources = [
diff --git a/dwds/BUILD.gn b/dwds/BUILD.gn
index a492030..4b99b9b 100644
--- a/dwds/BUILD.gn
+++ b/dwds/BUILD.gn
@@ -10,32 +10,32 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/pedantic",
-    "//third_party/dart-pkg/pub/shelf_packages_handler",
-    "//third_party/dart-pkg/pub/http",
-    "//third_party/dart-pkg/pub/shelf_web_socket",
-    "//third_party/dart-pkg/pub/shelf",
-    "//third_party/dart-pkg/pub/package_config",
-    "//third_party/dart-pkg/pub/http_multi_server",
-    "//third_party/dart-pkg/pub/meta",
-    "//third_party/dart-pkg/pub/shelf_proxy",
-    "//third_party/dart-pkg/pub/devtools_server",
-    "//third_party/dart-pkg/pub/sse",
-    "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/devtools",
-    "//third_party/dart-pkg/pub/webkit_inspection_protocol",
-    "//third_party/dart-pkg/pub/pool",
-    "//third_party/dart-pkg/pub/source_maps",
-    "//third_party/dart-pkg/pub/shelf_static",
-    "//third_party/dart-pkg/pub/built_collection",
-    "//third_party/dart-pkg/pub/logging",
-    "//third_party/dart-pkg/pub/pub_semver",
-    "//third_party/dart-pkg/pub/dds",
-    "//third_party/dart-pkg/pub/crypto",
-    "//third_party/dart-pkg/pub/web_socket_channel",
-    "//third_party/dart-pkg/pub/vm_service",
     "//third_party/dart-pkg/pub/async",
+    "//third_party/dart-pkg/pub/built_collection",
     "//third_party/dart-pkg/pub/built_value",
+    "//third_party/dart-pkg/pub/crypto",
+    "//third_party/dart-pkg/pub/dds",
+    "//third_party/dart-pkg/pub/devtools",
+    "//third_party/dart-pkg/pub/devtools_server",
+    "//third_party/dart-pkg/pub/http",
+    "//third_party/dart-pkg/pub/http_multi_server",
+    "//third_party/dart-pkg/pub/logging",
+    "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/package_config",
+    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/pedantic",
+    "//third_party/dart-pkg/pub/pool",
+    "//third_party/dart-pkg/pub/pub_semver",
+    "//third_party/dart-pkg/pub/shelf",
+    "//third_party/dart-pkg/pub/shelf_packages_handler",
+    "//third_party/dart-pkg/pub/shelf_proxy",
+    "//third_party/dart-pkg/pub/shelf_static",
+    "//third_party/dart-pkg/pub/shelf_web_socket",
+    "//third_party/dart-pkg/pub/source_maps",
+    "//third_party/dart-pkg/pub/sse",
+    "//third_party/dart-pkg/pub/vm_service",
+    "//third_party/dart-pkg/pub/web_socket_channel",
+    "//third_party/dart-pkg/pub/webkit_inspection_protocol",
   ]
 
   sources = [
diff --git a/fake_async/BUILD.gn b/fake_async/BUILD.gn
index 4c19e9c..1a35581 100644
--- a/fake_async/BUILD.gn
+++ b/fake_async/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/collection",
     "//third_party/dart-pkg/pub/clock",
+    "//third_party/dart-pkg/pub/collection",
   ]
 
   sources = [
diff --git a/file/BUILD.gn b/file/BUILD.gn
index 6d8e3d7..614d219 100644
--- a/file/BUILD.gn
+++ b/file/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/path",
   ]
 
   sources = [
diff --git a/file_testing/BUILD.gn b/file_testing/BUILD.gn
index 447f5e2..87f26c1 100644
--- a/file_testing/BUILD.gn
+++ b/file_testing/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/test_api",
     "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/test_api",
   ]
 
   sources = [
diff --git a/flutter_markdown/BUILD.gn b/flutter_markdown/BUILD.gn
index e55a4ca..7138cde 100644
--- a/flutter_markdown/BUILD.gn
+++ b/flutter_markdown/BUILD.gn
@@ -10,11 +10,11 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/markdown",
     "//third_party/dart-pkg/pub/meta",
-    "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/string_scanner",
+    "//third_party/dart-pkg/pub/path",
   ]
 
   sources = [
diff --git a/flutter_svg/BUILD.gn b/flutter_svg/BUILD.gn
index 7c564b9..87819e0 100644
--- a/flutter_svg/BUILD.gn
+++ b/flutter_svg/BUILD.gn
@@ -10,11 +10,11 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/xml",
-    "//third_party/dart-pkg/pub/vector_math",
-    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
+    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/path_drawing",
+    "//third_party/dart-pkg/pub/vector_math",
+    "//third_party/dart-pkg/pub/xml",
   ]
 
   sources = [
diff --git a/gcloud/BUILD.gn b/gcloud/BUILD.gn
index ec34d22..379e1e2 100644
--- a/gcloud/BUILD.gn
+++ b/gcloud/BUILD.gn
@@ -10,10 +10,10 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/googleapis",
-    "//third_party/dart-pkg/pub/meta",
-    "//third_party/dart-pkg/pub/http",
     "//third_party/dart-pkg/pub/_discoveryapis_commons",
+    "//third_party/dart-pkg/pub/googleapis",
+    "//third_party/dart-pkg/pub/http",
+    "//third_party/dart-pkg/pub/meta",
   ]
 
   sources = [
diff --git a/glob/BUILD.gn b/glob/BUILD.gn
index 18597b0..109382f 100644
--- a/glob/BUILD.gn
+++ b/glob/BUILD.gn
@@ -10,12 +10,12 @@
   disable_analysis = true
 
   deps = [
+    "//third_party/dart-pkg/pub/async",
+    "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/file",
+    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/pedantic",
     "//third_party/dart-pkg/pub/string_scanner",
-    "//third_party/dart-pkg/pub/file",
-    "//third_party/dart-pkg/pub/async",
-    "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/collection",
   ]
 
   sources = [
diff --git a/googleapis/BUILD.gn b/googleapis/BUILD.gn
index b89d455..683d646 100644
--- a/googleapis/BUILD.gn
+++ b/googleapis/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/http",
     "//third_party/dart-pkg/pub/_discoveryapis_commons",
+    "//third_party/dart-pkg/pub/http",
   ]
 
   sources = [
diff --git a/googleapis_auth/BUILD.gn b/googleapis_auth/BUILD.gn
index da1724b..774c19c 100644
--- a/googleapis_auth/BUILD.gn
+++ b/googleapis_auth/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/http",
     "//third_party/dart-pkg/pub/crypto",
+    "//third_party/dart-pkg/pub/http",
   ]
 
   sources = [
diff --git a/grpc/BUILD.gn b/grpc/BUILD.gn
index 72601a7..aaee2a6 100644
--- a/grpc/BUILD.gn
+++ b/grpc/BUILD.gn
@@ -11,8 +11,8 @@
 
   deps = [
     "//third_party/dart-pkg/pub/async",
-    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/googleapis_auth",
+    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/http",
     "//third_party/dart-pkg/pub/http2",
   ]
diff --git a/html/BUILD.gn b/html/BUILD.gn
index 8ef8c2a..c993cdb 100644
--- a/html/BUILD.gn
+++ b/html/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/source_span",
     "//third_party/dart-pkg/pub/csslib",
+    "//third_party/dart-pkg/pub/source_span",
   ]
 
   sources = [
diff --git a/http/BUILD.gn b/http/BUILD.gn
index ca17fe3..6693c3e 100644
--- a/http/BUILD.gn
+++ b/http/BUILD.gn
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
+    "//third_party/dart-pkg/pub/http_parser",
     "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/pedantic",
-    "//third_party/dart-pkg/pub/http_parser",
   ]
 
   sources = [
diff --git a/http_parser/BUILD.gn b/http_parser/BUILD.gn
index 17b2ba7..d5380ff 100644
--- a/http_parser/BUILD.gn
+++ b/http_parser/BUILD.gn
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/source_span",
     "//third_party/dart-pkg/pub/charcode",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/source_span",
     "//third_party/dart-pkg/pub/string_scanner",
     "//third_party/dart-pkg/pub/typed_data",
   ]
diff --git a/image/BUILD.gn b/image/BUILD.gn
index f33918e..a692967 100644
--- a/image/BUILD.gn
+++ b/image/BUILD.gn
@@ -1,4 +1,4 @@
-# This file is generated by importer.py for image-3.0.1
+# This file is generated by importer.py for image-3.0.2
 
 import("//build/dart/dart_library.gni")
 
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/xml",
-    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/archive",
+    "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/xml",
   ]
 
   sources = [
@@ -174,6 +174,7 @@
     "src/transform/flip.dart",
     "src/transform/trim.dart",
     "src/util/clip_line.dart",
+    "src/util/dither_pixels.dart",
     "src/util/input_buffer.dart",
     "src/util/interpolation.dart",
     "src/util/min_max.dart",
diff --git a/image/CHANGELOG.md b/image/CHANGELOG.md
index 31a12e9..e835f7a 100755
--- a/image/CHANGELOG.md
+++ b/image/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.0.2
+
+- Dithering support for GIF encoder.
+- Fix PNGEncoder issue if addFrame is called directly instead than encodeImage or encodeAnimation.
+- Optimization for drawImage.
+
 ## 3.0.1
 
 - Improve NeuralQuantizer to fix issue encoding small GIF images.
diff --git a/image/lib/src/draw/draw_image.dart b/image/lib/src/draw/draw_image.dart
index e2e3abb..a1f3361 100755
--- a/image/lib/src/draw/draw_image.dart
+++ b/image/lib/src/draw/draw_image.dart
@@ -31,16 +31,23 @@
   srcH ??= src.height;
   dstW ??= (dst.width < src.width) ? dstW = dst.width : src.width;
   dstH ??= (dst.height < src.height) ? dst.height : src.height;
-
-  for (var y = 0; y < dstH; ++y) {
-    for (var x = 0; x < dstW; ++x) {
-      final stepX = (x * (srcW / dstW)).toInt();
-      final stepY = (y * (srcH / dstH)).toInt();
-
-      final srcPixel = src.getPixel(srcX + stepX, srcY + stepY);
-      if (blend) {
+    
+  if (blend) {
+    for (var y = 0; y < dstH; ++y) {
+      for (var x = 0; x < dstW; ++x) {
+        final stepX = (x * (srcW / dstW)).toInt();
+        final stepY = (y * (srcH / dstH)).toInt();
+        final srcPixel = src.getPixel(srcX + stepX, srcY + stepY);
         drawPixel(dst, dstX + x, dstY + y, srcPixel);
-      } else {
+      }
+    }
+  }
+  else {
+    for (var y = 0; y < dstH; ++y) {
+      for (var x = 0; x < dstW; ++x) {
+        final stepX = (x * (srcW / dstW)).toInt();
+        final stepY = (y * (srcH / dstH)).toInt();
+        final srcPixel = src.getPixel(srcX + stepX, srcY + stepY);
         dst.setPixel(dstX + x, dstY + y, srcPixel);
       }
     }
diff --git a/image/lib/src/formats/gif_encoder.dart b/image/lib/src/formats/gif_encoder.dart
index 353f5f8..c65fe0f 100755
--- a/image/lib/src/formats/gif_encoder.dart
+++ b/image/lib/src/formats/gif_encoder.dart
@@ -2,14 +2,18 @@
 
 import '../animation.dart';
 import '../image.dart';
+import '../util/dither_pixels.dart';
 import '../util/neural_quantizer.dart';
 import '../util/output_buffer.dart';
 import 'encoder.dart';
 
 class GifEncoder extends Encoder {
   int delay, repeat, samplingFactor;
+  DitherKernel dither;
+  bool ditherSerpentine;
 
-  GifEncoder({this.delay = 80, this.repeat = 0, this.samplingFactor = 10})
+  GifEncoder({ this.delay = 80, this.repeat = 0, this.samplingFactor = 10,
+    this.dither = DitherKernel.FloydSteinberg, this.ditherSerpentine = false })
       : _encodedFrames = 0;
 
   /// This adds the frame passed to [image].
@@ -20,7 +24,8 @@
       output = OutputBuffer();
 
       _lastColorMap = NeuralQuantizer(image, samplingFactor: samplingFactor);
-      _lastImage = _lastColorMap!.getIndexMap(image);
+      _lastImage = ditherPixels(image, _lastColorMap!,
+          dither, ditherSerpentine);
       _lastImageDuration = duration;
 
       _width = image.width;
@@ -39,7 +44,8 @@
     _encodedFrames++;
 
     _lastColorMap = NeuralQuantizer(image, samplingFactor: samplingFactor);
-    _lastImage = _lastColorMap!.getIndexMap(image);
+    _lastImage = ditherPixels(image, _lastColorMap!,
+        dither, ditherSerpentine);
     _lastImageDuration = duration;
   }
 
@@ -347,7 +353,7 @@
 
   OutputBuffer? output;
 
-  static const String GIF89_STAMP = 'GIF89a';
+  static const GIF89_STAMP = 'GIF89a';
 
   static const IMAGE_DESC_RECORD_TYPE = 0x2c;
   static const EXTENSION_RECORD_TYPE = 0x21;
@@ -359,7 +365,7 @@
   static const EOF = -1;
   static const BITS = 12;
   static const HSIZE = 5003; // 80% occupancy
-  static const List<int> MASKS = [
+  static const MASKS = [
     0x0000,
     0x0001,
     0x0003,
diff --git a/image/lib/src/formats/png_encoder.dart b/image/lib/src/formats/png_encoder.dart
index 64c011c..152c457 100755
--- a/image/lib/src/formats/png_encoder.dart
+++ b/image/lib/src/formats/png_encoder.dart
@@ -362,7 +362,7 @@
 
   Channels? channels;
   int filter;
-  late int repeat;
+  int repeat = 0;
   int? level;
   late int xOffset;
   late int yOffset;
@@ -373,7 +373,7 @@
   late int _height;
   late int _frames;
   int sequenceNumber = 0;
-  late bool isAnimated;
+  bool isAnimated = false;
   OutputBuffer? output;
 
   static const FILTER_NONE = 0;
diff --git a/image/lib/src/util/dither_pixels.dart b/image/lib/src/util/dither_pixels.dart
new file mode 100755
index 0000000..3e1bfb4
--- /dev/null
+++ b/image/lib/src/util/dither_pixels.dart
@@ -0,0 +1,125 @@
+import 'dart:math';

+import 'dart:typed_data';

+import '../image.dart';

+import 'neural_quantizer.dart';

+

+// From http://jsbin.com/iXofIji/2/edit by PAEz

+enum DitherKernel {

+  None,

+  FalseFloydSteinberg,

+  FloydSteinberg,

+  Stucki,

+  Atkinson

+}

+

+const _ditherKernels = [

+  [

+    [0, 0, 0],

+    [0, 0, 0],

+    [0, 0, 0]

+  ],

+  // FalseFloydSteinberg

+  [

+    [3 / 8, 1, 0],

+    [3 / 8, 0, 1],

+    [2 / 8, 1, 1]

+  ],

+  // FloydSteinberg

+  [

+    [7 / 16, 1, 0],

+    [3 / 16, -1, 1],

+    [5 / 16, 0, 1],

+    [1 / 16, 1, 1]

+  ],

+  // Stucki

+  [

+    [8 / 42, 1, 0],

+    [4 / 42, 2, 0],

+    [2 / 42, -2, 1],

+    [4 / 42, -1, 1],

+    [8 / 42, 0, 1],

+    [4 / 42, 1, 1],

+    [2 / 42, 2, 1],

+    [1 / 42, -2, 2],

+    [2 / 42, -1, 2],

+    [4 / 42, 0, 2],

+    [2 / 42, 1, 2],

+    [1 / 42, 2, 2]

+  ],

+  //Atkinson:

+  [

+    [1 / 8, 1, 0],

+    [1 / 8, 2, 0],

+    [1 / 8, -1, 1],

+    [1 / 8, 0, 1],

+    [1 / 8, 1, 1],

+    [1 / 8, 0, 2]

+  ]

+];

+

+Uint8List ditherPixels(Image image, NeuralQuantizer quantizer,

+                  DitherKernel kernel, bool serpentine) {

+  if (kernel == DitherKernel.None) {

+    return quantizer.getIndexMap(image);

+  }

+

+  final ds = _ditherKernels[kernel.index];

+  final height = image.height;

+  final width = image.width;

+  final data = Uint8List.fromList(image.getBytes());

+

+  var direction = serpentine ? -1 : 1;

+

+  final indexedPixels = Uint8List(width * height);

+  final colorMap = quantizer.colorMap;

+

+  var index = 0;

+  for (var y = 0; y < height; y++) {

+    if (serpentine) direction = direction * -1;

+

+    final x0 = direction == 1 ? 0 : width - 1;

+    final x1 = direction == 1 ? width : 0;

+    for (var x = x0; x != x1; x += direction, ++index) {

+      // Get original color

+      var idx = index * 4;

+      final r1 = data[idx];

+      final g1 = data[idx + 1];

+      final b1 = data[idx + 2];

+

+      // Get converted color

+      idx = quantizer.lookupRGB(r1, g1, b1);

+

+      indexedPixels[index] = idx;

+      idx *= 3;

+      final r2 = colorMap[idx];

+      final g2 = colorMap[idx + 1];

+      final b2 = colorMap[idx + 2];

+

+      final er = r1 - r2;

+      final eg = g1 - g2;

+      final eb = b1 - b2;

+

+      if (er == 0 && eg == 0 && eb == 0) {

+        continue;

+      }

+

+      final i0 = direction == 1 ? 0: ds.length - 1;

+      final i1 = direction == 1 ? ds.length : 0;

+      for (var i = i0; i != i1; i += direction) {

+        final x1 = ds[i][1].toInt();

+        final y1 = ds[i][2].toInt();

+        if (x1 + x >= 0 && x1 + x < width && y1 + y >= 0 && y1 + y < height) {

+          var d = ds[i][0];

+          idx = index + x1 + (y1 * width);

+          idx *= 4;

+

+          data[idx] = max(0, min(255, (data[idx] + er * d).toInt()));

+          data[idx + 1] = max(0, min(255, (data[idx + 1] + eg * d).toInt()));

+          data[idx + 2] = max(0, min(255, (data[idx + 2] + eb * d).toInt()));

+        }

+      }

+    }

+  }

+

+  return indexedPixels;

+}

diff --git a/image/pubspec.yaml b/image/pubspec.yaml
index e8238f4..f35565b 100755
--- a/image/pubspec.yaml
+++ b/image/pubspec.yaml
@@ -1,5 +1,5 @@
 name: image
-version: 3.0.1
+version: 3.0.2
 description: >-
   Provides server and web apps the ability to load, manipulate, and save images
   with various image file formats including PNG, JPEG, GIF, BMP, WebP, TIFF,
diff --git a/intl/BUILD.gn b/intl/BUILD.gn
index 554d71c..981f91b 100644
--- a/intl/BUILD.gn
+++ b/intl/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/clock",
+    "//third_party/dart-pkg/pub/path",
   ]
 
   sources = [
diff --git a/io/BUILD.gn b/io/BUILD.gn
index 7d62fc2..f11eb89 100644
--- a/io/BUILD.gn
+++ b/io/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/string_scanner",
   ]
 
diff --git a/json_schema/BUILD.gn b/json_schema/BUILD.gn
index 71dd0fc..b51b609 100644
--- a/json_schema/BUILD.gn
+++ b/json_schema/BUILD.gn
@@ -10,10 +10,10 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/dart2_constant",
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/args",
+    "//third_party/dart-pkg/pub/dart2_constant",
     "//third_party/dart-pkg/pub/logging",
+    "//third_party/dart-pkg/pub/path",
   ]
 
   sources = [
diff --git a/markdown/BUILD.gn b/markdown/BUILD.gn
index 8398d96..0bc3826 100644
--- a/markdown/BUILD.gn
+++ b/markdown/BUILD.gn
@@ -11,8 +11,8 @@
 
   deps = [
     "//third_party/dart-pkg/pub/args",
-    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/charcode",
+    "//third_party/dart-pkg/pub/meta",
   ]
 
   sources = [
diff --git a/mockito/BUILD.gn b/mockito/BUILD.gn
index bb08c61..295fe12 100644
--- a/mockito/BUILD.gn
+++ b/mockito/BUILD.gn
@@ -10,16 +10,16 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/code_builder",
-    "//third_party/dart-pkg/pub/matcher",
-    "//third_party/dart-pkg/pub/collection",
-    "//third_party/dart-pkg/pub/test_api",
-    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/analyzer",
-    "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/dart_style",
-    "//third_party/dart-pkg/pub/source_gen",
     "//third_party/dart-pkg/pub/build",
+    "//third_party/dart-pkg/pub/code_builder",
+    "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/dart_style",
+    "//third_party/dart-pkg/pub/matcher",
+    "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/source_gen",
+    "//third_party/dart-pkg/pub/test_api",
   ]
 
   sources = [
diff --git a/native_stack_traces/BUILD.gn b/native_stack_traces/BUILD.gn
index d132d66..5bc191e 100644
--- a/native_stack_traces/BUILD.gn
+++ b/native_stack_traces/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/args",
+    "//third_party/dart-pkg/pub/path",
   ]
 
   sources = [
diff --git a/package_config.json b/package_config.json
index d035964..af62335 100644
--- a/package_config.json
+++ b/package_config.json
@@ -1,743 +1,743 @@
 {
-  "configVersion": 2, 
-  "generator": "package_importer.py", 
+  "configVersion": 2,
+  "generator": "package_importer.py",
   "packages": [
     {
-      "languageVersion": "2.0", 
-      "name": "_discoveryapis_commons", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "_discoveryapis_commons",
+      "packageUri": "lib/",
       "rootUri": "./_discoveryapis_commons/"
-    }, 
+    },
     {
-      "languageVersion": "2.2", 
-      "name": "_fe_analyzer_shared", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.2",
+      "name": "_fe_analyzer_shared",
+      "packageUri": "lib/",
       "rootUri": "./_fe_analyzer_shared/"
-    }, 
+    },
     {
-      "languageVersion": "2.7", 
-      "name": "analyzer", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.7",
+      "name": "analyzer",
+      "packageUri": "lib/",
       "rootUri": "./analyzer/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "archive", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "archive",
+      "packageUri": "lib/",
       "rootUri": "./archive/"
-    }, 
+    },
     {
-      "languageVersion": "2.3", 
-      "name": "args", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.3",
+      "name": "args",
+      "packageUri": "lib/",
       "rootUri": "./args/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "async", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "async",
+      "packageUri": "lib/",
       "rootUri": "./async/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "boolean_selector", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "boolean_selector",
+      "packageUri": "lib/",
       "rootUri": "./boolean_selector/"
-    }, 
+    },
     {
-      "languageVersion": "2.2", 
-      "name": "browser_launcher", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.2",
+      "name": "browser_launcher",
+      "packageUri": "lib/",
       "rootUri": "./browser_launcher/"
-    }, 
+    },
     {
-      "languageVersion": "2.9", 
-      "name": "build", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.9",
+      "name": "build",
+      "packageUri": "lib/",
       "rootUri": "./build/"
-    }, 
+    },
     {
-      "languageVersion": "2.6", 
-      "name": "built_collection", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.6",
+      "name": "built_collection",
+      "packageUri": "lib/",
       "rootUri": "./built_collection/"
-    }, 
+    },
     {
-      "languageVersion": "2.3", 
-      "name": "built_value", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.3",
+      "name": "built_value",
+      "packageUri": "lib/",
       "rootUri": "./built_value/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "characters", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "characters",
+      "packageUri": "lib/",
       "rootUri": "./characters/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "charcode", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "charcode",
+      "packageUri": "lib/",
       "rootUri": "./charcode/"
-    }, 
+    },
     {
-      "languageVersion": "2.7", 
-      "name": "checked_yaml", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.7",
+      "name": "checked_yaml",
+      "packageUri": "lib/",
       "rootUri": "./checked_yaml/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "cli_util", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "cli_util",
+      "packageUri": "lib/",
       "rootUri": "./cli_util/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "clock", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "clock",
+      "packageUri": "lib/",
       "rootUri": "./clock/"
-    }, 
+    },
     {
-      "languageVersion": "2.7", 
-      "name": "code_builder", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.7",
+      "name": "code_builder",
+      "packageUri": "lib/",
       "rootUri": "./code_builder/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "collection", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "collection",
+      "packageUri": "lib/",
       "rootUri": "./collection/"
-    }, 
+    },
     {
-      "languageVersion": "2.3", 
-      "name": "completion", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.3",
+      "name": "completion",
+      "packageUri": "lib/",
       "rootUri": "./completion/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "convert", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "convert",
+      "packageUri": "lib/",
       "rootUri": "./convert/"
-    }, 
+    },
     {
-      "languageVersion": "2.7", 
-      "name": "coverage", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.7",
+      "name": "coverage",
+      "packageUri": "lib/",
       "rootUri": "./coverage/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "crypto", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "crypto",
+      "packageUri": "lib/",
       "rootUri": "./crypto/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "csslib", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "csslib",
+      "packageUri": "lib/",
       "rootUri": "./csslib/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "dart2_constant", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "dart2_constant",
+      "packageUri": "lib/",
       "rootUri": "./dart2_constant/"
-    }, 
+    },
     {
-      "languageVersion": "2.9", 
-      "name": "dart_style", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.9",
+      "name": "dart_style",
+      "packageUri": "lib/",
       "rootUri": "./dart_style/"
-    }, 
+    },
     {
-      "languageVersion": "2.6", 
-      "name": "dds", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.6",
+      "name": "dds",
+      "packageUri": "lib/",
       "rootUri": "./dds/"
-    }, 
+    },
     {
-      "languageVersion": "2.3", 
-      "name": "devtools", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.3",
+      "name": "devtools",
+      "packageUri": "lib/",
       "rootUri": "./devtools/"
-    }, 
+    },
     {
-      "languageVersion": "2.6", 
-      "name": "devtools_server", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.6",
+      "name": "devtools_server",
+      "packageUri": "lib/",
       "rootUri": "./devtools_server/"
-    }, 
+    },
     {
-      "languageVersion": "2.3", 
-      "name": "devtools_shared", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.3",
+      "name": "devtools_shared",
+      "packageUri": "lib/",
       "rootUri": "./devtools_shared/"
-    }, 
+    },
     {
-      "languageVersion": "2.10", 
-      "name": "dwds", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.10",
+      "name": "dwds",
+      "packageUri": "lib/",
       "rootUri": "./dwds/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "edit_distance", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "edit_distance",
+      "packageUri": "lib/",
       "rootUri": "./edit_distance/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "fake_async", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "fake_async",
+      "packageUri": "lib/",
       "rootUri": "./fake_async/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "ffi", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "ffi",
+      "packageUri": "lib/",
       "rootUri": "./ffi/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "file", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "file",
+      "packageUri": "lib/",
       "rootUri": "./file/"
-    }, 
+    },
     {
-      "languageVersion": "2.1", 
-      "name": "file_testing", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.1",
+      "name": "file_testing",
+      "packageUri": "lib/",
       "rootUri": "./file_testing/"
-    }, 
+    },
     {
-      "languageVersion": "2.1", 
-      "name": "fixnum", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.1",
+      "name": "fixnum",
+      "packageUri": "lib/",
       "rootUri": "./fixnum/"
-    }, 
+    },
     {
-      "languageVersion": "1.24", 
-      "name": "flutter_flux", 
-      "packageUri": "lib/", 
+      "languageVersion": "1.24",
+      "name": "flutter_flux",
+      "packageUri": "lib/",
       "rootUri": "./flutter_flux/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "flutter_image", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "flutter_image",
+      "packageUri": "lib/",
       "rootUri": "./flutter_image/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "flutter_markdown", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "flutter_markdown",
+      "packageUri": "lib/",
       "rootUri": "./flutter_markdown/"
-    }, 
+    },
     {
-      "languageVersion": "1.19", 
-      "name": "flutter_staggered_grid_view", 
-      "packageUri": "lib/", 
+      "languageVersion": "1.19",
+      "name": "flutter_staggered_grid_view",
+      "packageUri": "lib/",
       "rootUri": "./flutter_staggered_grid_view/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "flutter_svg", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "flutter_svg",
+      "packageUri": "lib/",
       "rootUri": "./flutter_svg/"
-    }, 
+    },
     {
-      "languageVersion": "2.1", 
-      "name": "flutter_template_images", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.1",
+      "name": "flutter_template_images",
+      "packageUri": "lib/",
       "rootUri": "./flutter_template_images/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "gcloud", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "gcloud",
+      "packageUri": "lib/",
       "rootUri": "./gcloud/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "glob", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "glob",
+      "packageUri": "lib/",
       "rootUri": "./glob/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "googleapis", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "googleapis",
+      "packageUri": "lib/",
       "rootUri": "./googleapis/"
-    }, 
+    },
     {
-      "languageVersion": "2.1", 
-      "name": "googleapis_auth", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.1",
+      "name": "googleapis_auth",
+      "packageUri": "lib/",
       "rootUri": "./googleapis_auth/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "grpc", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "grpc",
+      "packageUri": "lib/",
       "rootUri": "./grpc/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "html", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "html",
+      "packageUri": "lib/",
       "rootUri": "./html/"
-    }, 
+    },
     {
-      "languageVersion": "2.1", 
-      "name": "html_unescape", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.1",
+      "name": "html_unescape",
+      "packageUri": "lib/",
       "rootUri": "./html_unescape/"
-    }, 
+    },
     {
-      "languageVersion": "2.4", 
-      "name": "http", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.4",
+      "name": "http",
+      "packageUri": "lib/",
       "rootUri": "./http/"
-    }, 
+    },
     {
-      "languageVersion": "2.5", 
-      "name": "http2", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.5",
+      "name": "http2",
+      "packageUri": "lib/",
       "rootUri": "./http2/"
-    }, 
+    },
     {
-      "languageVersion": "2.1", 
-      "name": "http_multi_server", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.1",
+      "name": "http_multi_server",
+      "packageUri": "lib/",
       "rootUri": "./http_multi_server/"
-    }, 
+    },
     {
-      "languageVersion": "2.3", 
-      "name": "http_parser", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.3",
+      "name": "http_parser",
+      "packageUri": "lib/",
       "rootUri": "./http_parser/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "image", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "image",
+      "packageUri": "lib/",
       "rootUri": "./image/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "intl", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "intl",
+      "packageUri": "lib/",
       "rootUri": "./intl/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "io", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "io",
+      "packageUri": "lib/",
       "rootUri": "./io/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "js", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "js",
+      "packageUri": "lib/",
       "rootUri": "./js/"
-    }, 
+    },
     {
-      "languageVersion": "2.7", 
-      "name": "json_annotation", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.7",
+      "name": "json_annotation",
+      "packageUri": "lib/",
       "rootUri": "./json_annotation/"
-    }, 
+    },
     {
-      "languageVersion": "2.2", 
-      "name": "json_rpc_2", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.2",
+      "name": "json_rpc_2",
+      "packageUri": "lib/",
       "rootUri": "./json_rpc_2/"
-    }, 
+    },
     {
-      "languageVersion": "1.8", 
-      "name": "json_schema", 
-      "packageUri": "lib/", 
+      "languageVersion": "1.8",
+      "name": "json_schema",
+      "packageUri": "lib/",
       "rootUri": "./json_schema/"
-    }, 
+    },
     {
-      "languageVersion": "1.0", 
-      "name": "lists", 
-      "packageUri": "lib/", 
+      "languageVersion": "1.0",
+      "name": "lists",
+      "packageUri": "lib/",
       "rootUri": "./lists/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "logging", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "logging",
+      "packageUri": "lib/",
       "rootUri": "./logging/"
-    }, 
+    },
     {
-      "languageVersion": "2.6", 
-      "name": "markdown", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.6",
+      "name": "markdown",
+      "packageUri": "lib/",
       "rootUri": "./markdown/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "matcher", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "matcher",
+      "packageUri": "lib/",
       "rootUri": "./matcher/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "meta", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "meta",
+      "packageUri": "lib/",
       "rootUri": "./meta/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "mime", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "mime",
+      "packageUri": "lib/",
       "rootUri": "./mime/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "mockito", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "mockito",
+      "packageUri": "lib/",
       "rootUri": "./mockito/"
-    }, 
+    },
     {
-      "languageVersion": "2.1", 
-      "name": "multicast_dns", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.1",
+      "name": "multicast_dns",
+      "packageUri": "lib/",
       "rootUri": "./multicast_dns/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "mustache_template", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "mustache_template",
+      "packageUri": "lib/",
       "rootUri": "./mustache_template/"
-    }, 
+    },
     {
-      "languageVersion": "2.8", 
-      "name": "native_stack_traces", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.8",
+      "name": "native_stack_traces",
+      "packageUri": "lib/",
       "rootUri": "./native_stack_traces/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "nested", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "nested",
+      "packageUri": "lib/",
       "rootUri": "./nested/"
-    }, 
+    },
     {
-      "languageVersion": "1.24", 
-      "name": "node_preamble", 
-      "packageUri": "lib/", 
+      "languageVersion": "1.24",
+      "name": "node_preamble",
+      "packageUri": "lib/",
       "rootUri": "./node_preamble/"
-    }, 
+    },
     {
-      "languageVersion": "2.7", 
-      "name": "package_config", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.7",
+      "name": "package_config",
+      "packageUri": "lib/",
       "rootUri": "./package_config/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "path", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "path",
+      "packageUri": "lib/",
       "rootUri": "./path/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "path_drawing", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "path_drawing",
+      "packageUri": "lib/",
       "rootUri": "./path_drawing/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "path_parsing", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "path_parsing",
+      "packageUri": "lib/",
       "rootUri": "./path_parsing/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "pedantic", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "pedantic",
+      "packageUri": "lib/",
       "rootUri": "./pedantic/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "petitparser", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "petitparser",
+      "packageUri": "lib/",
       "rootUri": "./petitparser/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "platform", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "platform",
+      "packageUri": "lib/",
       "rootUri": "./platform/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "pool", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "pool",
+      "packageUri": "lib/",
       "rootUri": "./pool/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "process", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "process",
+      "packageUri": "lib/",
       "rootUri": "./process/"
-    }, 
+    },
     {
-      "languageVersion": "2.7", 
-      "name": "protobuf", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.7",
+      "name": "protobuf",
+      "packageUri": "lib/",
       "rootUri": "./protobuf/"
-    }, 
+    },
     {
-      "languageVersion": "2.7", 
-      "name": "protoc_plugin", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.7",
+      "name": "protoc_plugin",
+      "packageUri": "lib/",
       "rootUri": "./protoc_plugin/"
-    }, 
+    },
     {
-      "languageVersion": "2.7", 
-      "name": "provider", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.7",
+      "name": "provider",
+      "packageUri": "lib/",
       "rootUri": "./provider/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "pub_semver", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "pub_semver",
+      "packageUri": "lib/",
       "rootUri": "./pub_semver/"
-    }, 
+    },
     {
-      "languageVersion": "2.7", 
-      "name": "pubspec_parse", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.7",
+      "name": "pubspec_parse",
+      "packageUri": "lib/",
       "rootUri": "./pubspec_parse/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "quiver", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "quiver",
+      "packageUri": "lib/",
       "rootUri": "./quiver/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "retry", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "retry",
+      "packageUri": "lib/",
       "rootUri": "./retry/"
-    }, 
+    },
     {
-      "languageVersion": "2.1", 
-      "name": "shelf", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.1",
+      "name": "shelf",
+      "packageUri": "lib/",
       "rootUri": "./shelf/"
-    }, 
+    },
     {
-      "languageVersion": "2.8", 
-      "name": "shelf_packages_handler", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.8",
+      "name": "shelf_packages_handler",
+      "packageUri": "lib/",
       "rootUri": "./shelf_packages_handler/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "shelf_proxy", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "shelf_proxy",
+      "packageUri": "lib/",
       "rootUri": "./shelf_proxy/"
-    }, 
+    },
     {
-      "languageVersion": "2.3", 
-      "name": "shelf_static", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.3",
+      "name": "shelf_static",
+      "packageUri": "lib/",
       "rootUri": "./shelf_static/"
-    }, 
+    },
     {
-      "languageVersion": "2.1", 
-      "name": "shelf_web_socket", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.1",
+      "name": "shelf_web_socket",
+      "packageUri": "lib/",
       "rootUri": "./shelf_web_socket/"
-    }, 
+    },
     {
-      "languageVersion": "2.10", 
-      "name": "source_gen", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.10",
+      "name": "source_gen",
+      "packageUri": "lib/",
       "rootUri": "./source_gen/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "source_map_stack_trace", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "source_map_stack_trace",
+      "packageUri": "lib/",
       "rootUri": "./source_map_stack_trace/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "source_maps", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "source_maps",
+      "packageUri": "lib/",
       "rootUri": "./source_maps/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "source_span", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "source_span",
+      "packageUri": "lib/",
       "rootUri": "./source_span/"
-    }, 
+    },
     {
-      "languageVersion": "2.2", 
-      "name": "sse", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.2",
+      "name": "sse",
+      "packageUri": "lib/",
       "rootUri": "./sse/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "stack_trace", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "stack_trace",
+      "packageUri": "lib/",
       "rootUri": "./stack_trace/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "stream_channel", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "stream_channel",
+      "packageUri": "lib/",
       "rootUri": "./stream_channel/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "string_scanner", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "string_scanner",
+      "packageUri": "lib/",
       "rootUri": "./string_scanner/"
-    }, 
+    },
     {
-      "languageVersion": "2.2", 
-      "name": "strings", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.2",
+      "name": "strings",
+      "packageUri": "lib/",
       "rootUri": "./strings/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "sync_http", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "sync_http",
+      "packageUri": "lib/",
       "rootUri": "./sync_http/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "term_glyph", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "term_glyph",
+      "packageUri": "lib/",
       "rootUri": "./term_glyph/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "test", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "test",
+      "packageUri": "lib/",
       "rootUri": "./test/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "test_api", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "test_api",
+      "packageUri": "lib/",
       "rootUri": "./test_api/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "test_core", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "test_core",
+      "packageUri": "lib/",
       "rootUri": "./test_core/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "tuple", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "tuple",
+      "packageUri": "lib/",
       "rootUri": "./tuple/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "typed_data", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "typed_data",
+      "packageUri": "lib/",
       "rootUri": "./typed_data/"
-    }, 
+    },
     {
-      "languageVersion": "2.2", 
-      "name": "unicode", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.2",
+      "name": "unicode",
+      "packageUri": "lib/",
       "rootUri": "./unicode/"
-    }, 
+    },
     {
-      "languageVersion": "2.2", 
-      "name": "usage", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.2",
+      "name": "usage",
+      "packageUri": "lib/",
       "rootUri": "./usage/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "uuid", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "uuid",
+      "packageUri": "lib/",
       "rootUri": "./uuid/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "vector_math", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "vector_math",
+      "packageUri": "lib/",
       "rootUri": "./vector_math/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "vm_service", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "vm_service",
+      "packageUri": "lib/",
       "rootUri": "./vm_service/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "vm_service_client", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "vm_service_client",
+      "packageUri": "lib/",
       "rootUri": "./vm_service_client/"
-    }, 
+    },
     {
-      "languageVersion": "2.8", 
-      "name": "vm_snapshot_analysis", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.8",
+      "name": "vm_snapshot_analysis",
+      "packageUri": "lib/",
       "rootUri": "./vm_snapshot_analysis/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "watcher", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "watcher",
+      "packageUri": "lib/",
       "rootUri": "./watcher/"
-    }, 
+    },
     {
-      "languageVersion": "2.10", 
-      "name": "web_socket_channel", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.10",
+      "name": "web_socket_channel",
+      "packageUri": "lib/",
       "rootUri": "./web_socket_channel/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "webdriver", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "webdriver",
+      "packageUri": "lib/",
       "rootUri": "./webdriver/"
-    }, 
+    },
     {
-      "languageVersion": "2.0", 
-      "name": "webkit_inspection_protocol", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.0",
+      "name": "webkit_inspection_protocol",
+      "packageUri": "lib/",
       "rootUri": "./webkit_inspection_protocol/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "webview_flutter", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "webview_flutter",
+      "packageUri": "lib/",
       "rootUri": "./webview_flutter/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "xml", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "xml",
+      "packageUri": "lib/",
       "rootUri": "./xml/"
-    }, 
+    },
     {
-      "languageVersion": "2.12", 
-      "name": "yaml", 
-      "packageUri": "lib/", 
+      "languageVersion": "2.12",
+      "name": "yaml",
+      "packageUri": "lib/",
       "rootUri": "./yaml/"
     }
   ]
diff --git a/process/BUILD.gn b/process/BUILD.gn
index 301e9b7..fd740e5 100644
--- a/process/BUILD.gn
+++ b/process/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/file",
+    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/platform",
   ]
 
diff --git a/protoc_plugin/BUILD.gn b/protoc_plugin/BUILD.gn
index 1540bf5..2fd3b62 100644
--- a/protoc_plugin/BUILD.gn
+++ b/protoc_plugin/BUILD.gn
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
+    "//third_party/dart-pkg/pub/fixnum",
     "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/protobuf",
-    "//third_party/dart-pkg/pub/fixnum",
     "//third_party/dart-pkg/pub/dart_style",
   ]
 
diff --git a/provider/BUILD.gn b/provider/BUILD.gn
index 80ab418..0774b42 100644
--- a/provider/BUILD.gn
+++ b/provider/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/nested",
   ]
 
diff --git a/pubspec_parse/BUILD.gn b/pubspec_parse/BUILD.gn
index 54f1e46..570befb 100644
--- a/pubspec_parse/BUILD.gn
+++ b/pubspec_parse/BUILD.gn
@@ -10,10 +10,10 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/yaml",
+    "//third_party/dart-pkg/pub/checked_yaml",
     "//third_party/dart-pkg/pub/json_annotation",
     "//third_party/dart-pkg/pub/pub_semver",
-    "//third_party/dart-pkg/pub/checked_yaml",
+    "//third_party/dart-pkg/pub/yaml",
   ]
 
   sources = [
diff --git a/shelf/BUILD.gn b/shelf/BUILD.gn
index 56bc9c8..dd42369 100644
--- a/shelf/BUILD.gn
+++ b/shelf/BUILD.gn
@@ -10,12 +10,12 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/stack_trace",
     "//third_party/dart-pkg/pub/async",
-    "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/stream_channel",
-    "//third_party/dart-pkg/pub/http_parser",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/http_parser",
+    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/stack_trace",
+    "//third_party/dart-pkg/pub/stream_channel",
   ]
 
   sources = [
diff --git a/shelf_proxy/BUILD.gn b/shelf_proxy/BUILD.gn
index 8bb7ddf..87c46df 100644
--- a/shelf_proxy/BUILD.gn
+++ b/shelf_proxy/BUILD.gn
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
+    "//third_party/dart-pkg/pub/http",
     "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/pedantic",
-    "//third_party/dart-pkg/pub/http",
     "//third_party/dart-pkg/pub/shelf",
   ]
 
diff --git a/shelf_static/BUILD.gn b/shelf_static/BUILD.gn
index d0442a9..28e7888 100644
--- a/shelf_static/BUILD.gn
+++ b/shelf_static/BUILD.gn
@@ -10,10 +10,10 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/convert",
-    "//third_party/dart-pkg/pub/mime",
     "//third_party/dart-pkg/pub/http_parser",
+    "//third_party/dart-pkg/pub/mime",
+    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/shelf",
   ]
 
diff --git a/shelf_web_socket/BUILD.gn b/shelf_web_socket/BUILD.gn
index 23c7481..f5f7402 100644
--- a/shelf_web_socket/BUILD.gn
+++ b/shelf_web_socket/BUILD.gn
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/web_socket_channel",
     "//third_party/dart-pkg/pub/shelf",
     "//third_party/dart-pkg/pub/stream_channel",
+    "//third_party/dart-pkg/pub/web_socket_channel",
   ]
 
   sources = [
diff --git a/source_gen/BUILD.gn b/source_gen/BUILD.gn
index 01d27a1..1227827 100644
--- a/source_gen/BUILD.gn
+++ b/source_gen/BUILD.gn
@@ -10,15 +10,15 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/pedantic",
-    "//third_party/dart-pkg/pub/async",
-    "//third_party/dart-pkg/pub/glob",
     "//third_party/dart-pkg/pub/analyzer",
-    "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/async",
     "//third_party/dart-pkg/pub/build",
-    "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/source_span",
     "//third_party/dart-pkg/pub/dart_style",
+    "//third_party/dart-pkg/pub/glob",
+    "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/pedantic",
+    "//third_party/dart-pkg/pub/source_span",
   ]
 
   sources = [
diff --git a/source_map_stack_trace/BUILD.gn b/source_map_stack_trace/BUILD.gn
index 2d0da6b..18b8d09 100644
--- a/source_map_stack_trace/BUILD.gn
+++ b/source_map_stack_trace/BUILD.gn
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/source_maps",
     "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/stack_trace",
+    "//third_party/dart-pkg/pub/source_maps",
   ]
 
   sources = [
diff --git a/source_span/BUILD.gn b/source_span/BUILD.gn
index db53b0d..f4cd52e 100644
--- a/source_span/BUILD.gn
+++ b/source_span/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/term_glyph",
   ]
 
diff --git a/sse/BUILD.gn b/sse/BUILD.gn
index 7cad699..8bf8f61 100644
--- a/sse/BUILD.gn
+++ b/sse/BUILD.gn
@@ -10,12 +10,12 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/pedantic",
-    "//third_party/dart-pkg/pub/logging",
     "//third_party/dart-pkg/pub/async",
-    "//third_party/dart-pkg/pub/shelf",
-    "//third_party/dart-pkg/pub/stream_channel",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/logging",
+    "//third_party/dart-pkg/pub/pedantic",
+    "//third_party/dart-pkg/pub/stream_channel",
+    "//third_party/dart-pkg/pub/shelf",
   ]
 
   sources = [
diff --git a/string_scanner/BUILD.gn b/string_scanner/BUILD.gn
index 88c165c..92150ee 100644
--- a/string_scanner/BUILD.gn
+++ b/string_scanner/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/source_span",
     "//third_party/dart-pkg/pub/charcode",
+    "//third_party/dart-pkg/pub/source_span",
   ]
 
   sources = [
diff --git a/test/BUILD.gn b/test/BUILD.gn
index eb0f313..3c848e1 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -10,31 +10,31 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/stack_trace",
-    "//third_party/dart-pkg/pub/pedantic",
+    "//third_party/dart-pkg/pub/analyzer",
+    "//third_party/dart-pkg/pub/async",
+    "//third_party/dart-pkg/pub/boolean_selector",
+    "//third_party/dart-pkg/pub/coverage",
+    "//third_party/dart-pkg/pub/http_multi_server",
+    "//third_party/dart-pkg/pub/io",
+    "//third_party/dart-pkg/pub/js",
+    "//third_party/dart-pkg/pub/node_preamble",
     "//third_party/dart-pkg/pub/package_config",
-    "//third_party/dart-pkg/pub/shelf_web_socket",
-    "//third_party/dart-pkg/pub/typed_data",
+    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/pedantic",
+    "//third_party/dart-pkg/pub/pool",
     "//third_party/dart-pkg/pub/shelf",
     "//third_party/dart-pkg/pub/shelf_packages_handler",
-    "//third_party/dart-pkg/pub/node_preamble",
-    "//third_party/dart-pkg/pub/analyzer",
-    "//third_party/dart-pkg/pub/http_multi_server",
-    "//third_party/dart-pkg/pub/test_api",
-    "//third_party/dart-pkg/pub/io",
-    "//third_party/dart-pkg/pub/test_core",
-    "//third_party/dart-pkg/pub/coverage",
-    "//third_party/dart-pkg/pub/source_span",
-    "//third_party/dart-pkg/pub/stream_channel",
-    "//third_party/dart-pkg/pub/js",
-    "//third_party/dart-pkg/pub/webkit_inspection_protocol",
-    "//third_party/dart-pkg/pub/pool",
     "//third_party/dart-pkg/pub/shelf_static",
+    "//third_party/dart-pkg/pub/shelf_web_socket",
+    "//third_party/dart-pkg/pub/source_span",
+    "//third_party/dart-pkg/pub/stack_trace",
+    "//third_party/dart-pkg/pub/stream_channel",
+    "//third_party/dart-pkg/pub/typed_data",
     "//third_party/dart-pkg/pub/web_socket_channel",
+    "//third_party/dart-pkg/pub/webkit_inspection_protocol",
     "//third_party/dart-pkg/pub/yaml",
-    "//third_party/dart-pkg/pub/boolean_selector",
-    "//third_party/dart-pkg/pub/async",
-    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/test_api",
+    "//third_party/dart-pkg/pub/test_core",
   ]
 
   sources = [
diff --git a/test_api/BUILD.gn b/test_api/BUILD.gn
index 0b4031b..5536aa3 100644
--- a/test_api/BUILD.gn
+++ b/test_api/BUILD.gn
@@ -10,17 +10,17 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/stack_trace",
     "//third_party/dart-pkg/pub/async",
-    "//third_party/dart-pkg/pub/matcher",
+    "//third_party/dart-pkg/pub/boolean_selector",
     "//third_party/dart-pkg/pub/collection",
     "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/source_span",
+    "//third_party/dart-pkg/pub/stack_trace",
+    "//third_party/dart-pkg/pub/stream_channel",
     "//third_party/dart-pkg/pub/string_scanner",
     "//third_party/dart-pkg/pub/term_glyph",
-    "//third_party/dart-pkg/pub/boolean_selector",
-    "//third_party/dart-pkg/pub/source_span",
-    "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/stream_channel",
+    "//third_party/dart-pkg/pub/matcher",
   ]
 
   sources = [
diff --git a/test_core/BUILD.gn b/test_core/BUILD.gn
index b57ba5a..ef96754 100644
--- a/test_core/BUILD.gn
+++ b/test_core/BUILD.gn
@@ -10,28 +10,28 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/stack_trace",
-    "//third_party/dart-pkg/pub/pedantic",
-    "//third_party/dart-pkg/pub/args",
-    "//third_party/dart-pkg/pub/coverage",
-    "//third_party/dart-pkg/pub/matcher",
-    "//third_party/dart-pkg/pub/glob",
-    "//third_party/dart-pkg/pub/package_config",
-    "//third_party/dart-pkg/pub/collection",
-    "//third_party/dart-pkg/pub/test_api",
-    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/analyzer",
-    "//third_party/dart-pkg/pub/io",
-    "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/source_span",
-    "//third_party/dart-pkg/pub/stream_channel",
-    "//third_party/dart-pkg/pub/pool",
-    "//third_party/dart-pkg/pub/source_maps",
-    "//third_party/dart-pkg/pub/source_map_stack_trace",
-    "//third_party/dart-pkg/pub/yaml",
-    "//third_party/dart-pkg/pub/vm_service",
-    "//third_party/dart-pkg/pub/boolean_selector",
     "//third_party/dart-pkg/pub/async",
+    "//third_party/dart-pkg/pub/args",
+    "//third_party/dart-pkg/pub/boolean_selector",
+    "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/coverage",
+    "//third_party/dart-pkg/pub/glob",
+    "//third_party/dart-pkg/pub/io",
+    "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/package_config",
+    "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/pedantic",
+    "//third_party/dart-pkg/pub/pool",
+    "//third_party/dart-pkg/pub/source_map_stack_trace",
+    "//third_party/dart-pkg/pub/source_maps",
+    "//third_party/dart-pkg/pub/source_span",
+    "//third_party/dart-pkg/pub/stack_trace",
+    "//third_party/dart-pkg/pub/stream_channel",
+    "//third_party/dart-pkg/pub/vm_service",
+    "//third_party/dart-pkg/pub/yaml",
+    "//third_party/dart-pkg/pub/matcher",
+    "//third_party/dart-pkg/pub/test_api",
   ]
 
   sources = [
diff --git a/vm_service_client/BUILD.gn b/vm_service_client/BUILD.gn
index 82e932f..2bb8b28 100644
--- a/vm_service_client/BUILD.gn
+++ b/vm_service_client/BUILD.gn
@@ -10,14 +10,14 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/stack_trace",
-    "//third_party/dart-pkg/pub/pub_semver",
-    "//third_party/dart-pkg/pub/web_socket_channel",
+    "//third_party/dart-pkg/pub/async",
     "//third_party/dart-pkg/pub/collection",
     "//third_party/dart-pkg/pub/json_rpc_2",
-    "//third_party/dart-pkg/pub/async",
-    "//third_party/dart-pkg/pub/stream_channel",
+    "//third_party/dart-pkg/pub/pub_semver",
     "//third_party/dart-pkg/pub/source_span",
+    "//third_party/dart-pkg/pub/stack_trace",
+    "//third_party/dart-pkg/pub/stream_channel",
+    "//third_party/dart-pkg/pub/web_socket_channel",
   ]
 
   sources = [
diff --git a/vm_snapshot_analysis/BUILD.gn b/vm_snapshot_analysis/BUILD.gn
index 9c417c5..09ddcc7 100644
--- a/vm_snapshot_analysis/BUILD.gn
+++ b/vm_snapshot_analysis/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/args",
+    "//third_party/dart-pkg/pub/path",
     "//third_party/dart-pkg/pub/meta",
   ]
 
diff --git a/watcher/BUILD.gn b/watcher/BUILD.gn
index 5312103..8cda259 100644
--- a/watcher/BUILD.gn
+++ b/watcher/BUILD.gn
@@ -11,8 +11,8 @@
 
   deps = [
     "//third_party/dart-pkg/pub/async",
-    "//third_party/dart-pkg/pub/pedantic",
     "//third_party/dart-pkg/pub/path",
+    "//third_party/dart-pkg/pub/pedantic",
   ]
 
   sources = [
diff --git a/web_socket_channel/BUILD.gn b/web_socket_channel/BUILD.gn
index a710a6f..dbc6d22 100644
--- a/web_socket_channel/BUILD.gn
+++ b/web_socket_channel/BUILD.gn
@@ -11,8 +11,8 @@
 
   deps = [
     "//third_party/dart-pkg/pub/async",
-    "//third_party/dart-pkg/pub/stream_channel",
     "//third_party/dart-pkg/pub/crypto",
+    "//third_party/dart-pkg/pub/stream_channel",
   ]
 
   sources = [
diff --git a/webdriver/BUILD.gn b/webdriver/BUILD.gn
index 7e1a43f..fb36dd7 100644
--- a/webdriver/BUILD.gn
+++ b/webdriver/BUILD.gn
@@ -13,8 +13,8 @@
     "//third_party/dart-pkg/pub/archive",
     "//third_party/dart-pkg/pub/matcher",
     "//third_party/dart-pkg/pub/path",
-    "//third_party/dart-pkg/pub/sync_http",
     "//third_party/dart-pkg/pub/stack_trace",
+    "//third_party/dart-pkg/pub/sync_http",
   ]
 
   sources = [
diff --git a/xml/BUILD.gn b/xml/BUILD.gn
index b854fec..e4be83f 100644
--- a/xml/BUILD.gn
+++ b/xml/BUILD.gn
@@ -10,9 +10,9 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/petitparser",
-    "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/meta",
+    "//third_party/dart-pkg/pub/petitparser",
   ]
 
   sources = [
diff --git a/yaml/BUILD.gn b/yaml/BUILD.gn
index 6514cd5..bfb3466 100644
--- a/yaml/BUILD.gn
+++ b/yaml/BUILD.gn
@@ -10,8 +10,8 @@
   disable_analysis = true
 
   deps = [
-    "//third_party/dart-pkg/pub/source_span",
     "//third_party/dart-pkg/pub/collection",
+    "//third_party/dart-pkg/pub/source_span",
     "//third_party/dart-pkg/pub/string_scanner",
   ]