diff --git a/.cirrus.yml b/.cirrus.yml
index a2c84ec..6c908b2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -8,7 +8,7 @@
     - git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
     # Pinned version of the plugin tools, to avoid breakage in this repository
     # when pushing updates from flutter/plugins.
-    - pub global activate flutter_plugin_tools 0.1.1
+    - pub global activate flutter_plugin_tools 0.1.4
 
 flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
   upgrade_flutter_script:
@@ -33,6 +33,7 @@
       format_script: ./script/tool_runner.sh format --fail-on-change --clang-format=clang-format-5.0
       license_script: pub global run flutter_plugin_tools license-check
       analyze_script: ./script/tool_runner.sh analyze --custom-analysis=web_benchmarks/testing/test_app,flutter_lints/example
+      pubspec_script: ./script/tool_runner.sh pubspec-check
     - name: publishable
       version_script: ./script/tool_runner.sh version-check
       publishable_script: ./script/tool_runner.sh publish-check
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 6671951..21a3c26 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -167,7 +167,7 @@
     - slash_for_doc_comments
     # - sort_child_properties_last # not yet tested
     - sort_constructors_first
-    - sort_pub_dependencies
+    # - sort_pub_dependencies
     - sort_unnamed_constructors_first
     - test_types_in_equals
     - throw_in_finally
@@ -209,3 +209,7 @@
     # - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
     - valid_regexps
     - void_checks
+    ### Local flutter/packages changes ###
+    # Flutter has a specific use case for dependencies that are intentionally
+    # not sorted, which doesn't apply to this repo.
+    - sort_pub_dependencies
diff --git a/packages/animations/pubspec.yaml b/packages/animations/pubspec.yaml
index 7c6a50d..839609f 100644
--- a/packages/animations/pubspec.yaml
+++ b/packages/animations/pubspec.yaml
@@ -1,7 +1,8 @@
 name: animations
 description: Fancy pre-built animations that can easily be integrated into any Flutter application.
+repository: https://github.com/flutter/packages/tree/master/packages/animations
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+animations%22
 version: 2.0.1
-homepage: https://github.com/flutter/packages/tree/master/packages/animations
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
diff --git a/packages/cross_file/pubspec.yaml b/packages/cross_file/pubspec.yaml
index 5195602..b207dc8 100644
--- a/packages/cross_file/pubspec.yaml
+++ b/packages/cross_file/pubspec.yaml
@@ -1,8 +1,13 @@
 name: cross_file
 description: An abstraction to allow working with files across multiple platforms.
 repository: https://github.com/flutter/packages/tree/master/packages/cross_file
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+cross_file%22
 version: 0.3.1+1
 
+environment:
+  sdk: ">=2.12.0 <3.0.0"
+  flutter: ">=1.22.0"
+
 dependencies:
   flutter:
     sdk: flutter
@@ -12,7 +17,3 @@
   flutter_test:
     sdk: flutter
   pedantic: ^1.10.0
-
-environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.22.0"
diff --git a/packages/cross_file/test/x_file_html_test.dart b/packages/cross_file/test/x_file_html_test.dart
index 4809919..c214672 100644
--- a/packages/cross_file/test/x_file_html_test.dart
+++ b/packages/cross_file/test/x_file_html_test.dart
@@ -8,8 +8,8 @@
 import 'dart:html' as html;
 import 'dart:typed_data';
 
-import 'package:flutter_test/flutter_test.dart';
 import 'package:cross_file/cross_file.dart';
+import 'package:flutter_test/flutter_test.dart';
 
 const String expectedStringContents = 'Hello, world!';
 final Uint8List bytes = Uint8List.fromList(utf8.encode(expectedStringContents));
diff --git a/packages/cross_file/test/x_file_io_test.dart b/packages/cross_file/test/x_file_io_test.dart
index 042b323..4affc85 100644
--- a/packages/cross_file/test/x_file_io_test.dart
+++ b/packages/cross_file/test/x_file_io_test.dart
@@ -8,8 +8,8 @@
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:flutter_test/flutter_test.dart';
 import 'package:cross_file/cross_file.dart';
+import 'package:flutter_test/flutter_test.dart';
 
 final String pathPrefix =
     Directory.current.path.endsWith('test') ? './assets/' : './test/assets/';
diff --git a/packages/css_colors/pubspec.yaml b/packages/css_colors/pubspec.yaml
index 1d09d46..7c241fd 100644
--- a/packages/css_colors/pubspec.yaml
+++ b/packages/css_colors/pubspec.yaml
@@ -1,6 +1,7 @@
 name: css_colors
 description: Defines constants for the CSS Colors
 repository: https://github.com/flutter/packages/tree/master/packages/css_colors
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+css_colors%22
 version: 1.1.1
 
 environment:
diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/lib/main.dart b/packages/extension_google_sign_in_as_googleapis_auth/example/lib/main.dart
index 5c51d46..996be9c 100755
--- a/packages/extension_google_sign_in_as_googleapis_auth/example/lib/main.dart
+++ b/packages/extension_google_sign_in_as_googleapis_auth/example/lib/main.dart
@@ -4,10 +4,9 @@
 
 import 'dart:async';
 
+import 'package:extension_google_sign_in_as_googleapis_auth/extension_google_sign_in_as_googleapis_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:google_sign_in/google_sign_in.dart';
-
-import 'package:extension_google_sign_in_as_googleapis_auth/extension_google_sign_in_as_googleapis_auth.dart';
 import 'package:googleapis/people/v1.dart';
 
 final GoogleSignIn _googleSignIn = GoogleSignIn(
diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml b/packages/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml
index b5ed9a1..a0b2e02 100644
--- a/packages/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml
+++ b/packages/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml
@@ -2,6 +2,10 @@
 description: Example of Google Sign-In plugin and googleapis.
 publish_to: none
 
+environment:
+  sdk: ">=2.12.0 <3.0.0"
+  flutter: ">=1.20.0"
+
 dependencies:
   extension_google_sign_in_as_googleapis_auth:
     # When depending on this package from a real application you should use:
@@ -20,7 +24,3 @@
 
 flutter:
   uses-material-design: true
-
-environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.20.0"
diff --git a/packages/extension_google_sign_in_as_googleapis_auth/pubspec.yaml b/packages/extension_google_sign_in_as_googleapis_auth/pubspec.yaml
index 8f8de01..c14ac47 100644
--- a/packages/extension_google_sign_in_as_googleapis_auth/pubspec.yaml
+++ b/packages/extension_google_sign_in_as_googleapis_auth/pubspec.yaml
@@ -6,8 +6,13 @@
 
 name: extension_google_sign_in_as_googleapis_auth
 description: A bridge package between google_sign_in and googleapis_auth, to create Authenticated Clients from google_sign_in user credentials.
-version: 2.0.2
 repository: https://github.com/flutter/packages/tree/master/packages/extension_google_sign_in_as_googleapis_auth
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+extension_google_sign_in_as_googleapis_auth%22
+version: 2.0.2
+
+environment:
+  sdk: ">=2.12.0 <3.0.0"
+  flutter: ">=1.20.0"
 
 dependencies:
   flutter:
@@ -21,7 +26,3 @@
   flutter_test:
     sdk: flutter
   pedantic: ^1.10.0
-
-environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.20.0"
diff --git a/packages/extension_google_sign_in_as_googleapis_auth/test/extension_google_sign_in_as_googleapis_auth_test.dart b/packages/extension_google_sign_in_as_googleapis_auth/test/extension_google_sign_in_as_googleapis_auth_test.dart
index 73796eb..c4c7939 100644
--- a/packages/extension_google_sign_in_as_googleapis_auth/test/extension_google_sign_in_as_googleapis_auth_test.dart
+++ b/packages/extension_google_sign_in_as_googleapis_auth/test/extension_google_sign_in_as_googleapis_auth_test.dart
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:google_sign_in/google_sign_in.dart';
-import 'package:googleapis_auth/googleapis_auth.dart' as gapis;
 import 'package:extension_google_sign_in_as_googleapis_auth/extension_google_sign_in_as_googleapis_auth.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:google_sign_in/google_sign_in.dart';
+import 'package:googleapis_auth/googleapis_auth.dart' as gapis;
 
 const String SOME_FAKE_ACCESS_TOKEN = 'this-is-something-not-null';
 const List<String> DEBUG_FAKE_SCOPES = <String>['some-scope', 'another-scope'];
diff --git a/packages/flutter_image/pubspec.yaml b/packages/flutter_image/pubspec.yaml
index 433a6aa..9017239 100644
--- a/packages/flutter_image/pubspec.yaml
+++ b/packages/flutter_image/pubspec.yaml
@@ -2,8 +2,13 @@
 description: >
   Image utilities for Flutter: providers, effects, etc
 repository: https://github.com/flutter/packages/tree/master/packages/flutter_image
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_image%22
 version: 4.0.1
 
+environment:
+  sdk: ">=2.12.0 <3.0.0"
+  flutter: ">=1.10.15-pre.144"
+
 dependencies:
   flutter:
     sdk: flutter
@@ -13,7 +18,3 @@
     sdk: flutter
   quiver: ^3.0.0
   test: any
-
-environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.10.15-pre.144"
diff --git a/packages/flutter_lints/pubspec.yaml b/packages/flutter_lints/pubspec.yaml
index 5e1386b..23df97a 100644
--- a/packages/flutter_lints/pubspec.yaml
+++ b/packages/flutter_lints/pubspec.yaml
@@ -1,7 +1,8 @@
 name: flutter_lints
 description: Recommended lints for Flutter apps, packages, and plugins to encourage good coding practices.
+repository: https://github.com/flutter/packages/tree/master/packages/flutter_lints
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_lints%22
 version: 1.0.3
-homepage: https://github.com/flutter/packages/tree/master/packages/flutter_lints
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
diff --git a/packages/flutter_markdown/pubspec.yaml b/packages/flutter_markdown/pubspec.yaml
index 03863ae..d36ce6c 100644
--- a/packages/flutter_markdown/pubspec.yaml
+++ b/packages/flutter_markdown/pubspec.yaml
@@ -3,8 +3,13 @@
   including text styles, tables, links, and more, from plain text data
   formatted with simple Markdown tags.
 repository: https://github.com/flutter/packages/tree/master/packages/flutter_markdown
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_markdown%22
 version: 0.6.2
 
+environment:
+  sdk: ">=2.12.0 <3.0.0"
+  flutter: ">=1.17.0"
+
 dependencies:
   flutter:
     sdk: flutter
@@ -16,7 +21,3 @@
   flutter_test:
     sdk: flutter
   mockito: ^5.0.0
-
-environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.17.0"
diff --git a/packages/flutter_template_images/pubspec.yaml b/packages/flutter_template_images/pubspec.yaml
index 275c003..13c235c 100644
--- a/packages/flutter_template_images/pubspec.yaml
+++ b/packages/flutter_template_images/pubspec.yaml
@@ -1,7 +1,8 @@
 name: flutter_template_images
 description: Image files for use in flutter_tools templates.
+repository: https://github.com/flutter/packages/tree/master/packages/flutter_template_images
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_template_images%22
 version: 3.0.1
-homepage: https://github.com/flutter/packages/tree/master/packages/flutter_template_images
 
 environment:
   sdk: ">=2.1.0 <3.0.0"
diff --git a/packages/fuchsia_ctl/bin/main.dart b/packages/fuchsia_ctl/bin/main.dart
index ba3bfa3..2bb4f03 100644
--- a/packages/fuchsia_ctl/bin/main.dart
+++ b/packages/fuchsia_ctl/bin/main.dart
@@ -7,13 +7,12 @@
 import 'package:args/args.dart';
 import 'package:file/file.dart';
 import 'package:file/local.dart';
+import 'package:fuchsia_ctl/fuchsia_ctl.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 import 'package:retry/retry.dart';
 import 'package:uuid/uuid.dart';
 
-import 'package:fuchsia_ctl/fuchsia_ctl.dart';
-
 typedef AsyncResult = Future<OperationResult> Function(
     String, DevFinder, ArgResults);
 
diff --git a/packages/fuchsia_ctl/lib/src/amber_ctl.dart b/packages/fuchsia_ctl/lib/src/amber_ctl.dart
index 7ab29c5..19b1538 100644
--- a/packages/fuchsia_ctl/lib/src/amber_ctl.dart
+++ b/packages/fuchsia_ctl/lib/src/amber_ctl.dart
@@ -4,11 +4,10 @@
 
 import 'dart:io';
 
+import 'package:fuchsia_ctl/fuchsia_ctl.dart';
 import 'package:meta/meta.dart';
 import 'package:uuid/uuid.dart';
 
-import 'package:fuchsia_ctl/fuchsia_ctl.dart';
-
 const SshClient _kSsh = SshClient();
 
 /// Wrapper for amberctl utility for commands executed on the target device.
diff --git a/packages/fuchsia_ctl/lib/src/package_server.dart b/packages/fuchsia_ctl/lib/src/package_server.dart
index 496a9d0..c568983 100644
--- a/packages/fuchsia_ctl/lib/src/package_server.dart
+++ b/packages/fuchsia_ctl/lib/src/package_server.dart
@@ -8,11 +8,10 @@
 
 import 'package:file/file.dart';
 import 'package:file/local.dart';
-import 'package:process/process.dart';
-import 'package:path/path.dart' as path;
-import 'package:uuid/uuid.dart';
-
 import 'package:fuchsia_ctl/fuchsia_ctl.dart';
+import 'package:path/path.dart' as path;
+import 'package:process/process.dart';
+import 'package:uuid/uuid.dart';
 
 /// A wrapper around the Fuchsia SDK `pm` tool.
 class PackageServer {
diff --git a/packages/fuchsia_ctl/pubspec.yaml b/packages/fuchsia_ctl/pubspec.yaml
index 14c8585..bb9fa5d 100644
--- a/packages/fuchsia_ctl/pubspec.yaml
+++ b/packages/fuchsia_ctl/pubspec.yaml
@@ -3,7 +3,8 @@
   A Dart package for paving, serving packages to, and running commands on a
   Fuchsia Device. This package is primarily intended for use in Flutter's
   continuous integration/testing infrastructure.
-homepage: https://github.com/flutter/packages/tree/master/packages/fuchsia_ctl
+repository: https://github.com/flutter/packages/tree/master/packages/fuchsia_ctl
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+fuchsia_ctl%22
 version: 0.0.24
 
 environment:
diff --git a/packages/fuchsia_ctl/test/command_line_test.dart b/packages/fuchsia_ctl/test/command_line_test.dart
index c417afe..2e1891a 100644
--- a/packages/fuchsia_ctl/test/command_line_test.dart
+++ b/packages/fuchsia_ctl/test/command_line_test.dart
@@ -4,12 +4,11 @@
 // @dart = 2.4
 import 'dart:io';
 
+import 'package:fuchsia_ctl/src/command_line.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:test/test.dart';
 
-import 'package:fuchsia_ctl/src/command_line.dart';
-
 import 'fakes.dart';
 
 void main() {
diff --git a/packages/fuchsia_ctl/test/emulator_test.dart b/packages/fuchsia_ctl/test/emulator_test.dart
index 6ac16e0..8af8a00 100644
--- a/packages/fuchsia_ctl/test/emulator_test.dart
+++ b/packages/fuchsia_ctl/test/emulator_test.dart
@@ -3,11 +3,10 @@
 // found in the LICENSE file.
 // @dart = 2.4
 import 'package:file/memory.dart';
+import 'package:fuchsia_ctl/fuchsia_ctl.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 
-import 'package:fuchsia_ctl/fuchsia_ctl.dart';
-
 import 'fakes.dart';
 
 void main() {
diff --git a/packages/fuchsia_ctl/test/fakes.dart b/packages/fuchsia_ctl/test/fakes.dart
index 70c6997..9eec57f 100644
--- a/packages/fuchsia_ctl/test/fakes.dart
+++ b/packages/fuchsia_ctl/test/fakes.dart
@@ -6,10 +6,9 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:mockito/mockito.dart';
-
 import 'package:fuchsia_ctl/fuchsia_ctl.dart';
 import 'package:fuchsia_ctl/src/command_line.dart';
+import 'package:mockito/mockito.dart';
 
 class FakeProcess implements Process {
   FakeProcess(this._exitCode, this._stdout, this._stderr);
diff --git a/packages/fuchsia_ctl/test/package_server_test.dart b/packages/fuchsia_ctl/test/package_server_test.dart
index a6572dc..adef383 100644
--- a/packages/fuchsia_ctl/test/package_server_test.dart
+++ b/packages/fuchsia_ctl/test/package_server_test.dart
@@ -8,8 +8,8 @@
 import 'package:file/file.dart';
 import 'package:file/memory.dart';
 import 'package:fuchsia_ctl/fuchsia_ctl.dart';
-import 'package:fuchsia_ctl/src/package_server.dart';
 import 'package:fuchsia_ctl/src/operation_result.dart';
+import 'package:fuchsia_ctl/src/package_server.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:test/test.dart';
diff --git a/packages/fuchsia_ctl/test/ssh_client_test.dart b/packages/fuchsia_ctl/test/ssh_client_test.dart
index f05a98a..995c77e 100644
--- a/packages/fuchsia_ctl/test/ssh_client_test.dart
+++ b/packages/fuchsia_ctl/test/ssh_client_test.dart
@@ -7,8 +7,8 @@
 import 'package:file/file.dart';
 import 'package:file/memory.dart';
 import 'package:fuchsia_ctl/fuchsia_ctl.dart';
-import 'package:fuchsia_ctl/src/ssh_client.dart';
 import 'package:fuchsia_ctl/src/operation_result.dart';
+import 'package:fuchsia_ctl/src/ssh_client.dart';
 import 'package:mockito/mockito.dart';
 import 'package:process/process.dart';
 import 'package:test/test.dart';
diff --git a/packages/fuchsia_ctl/test/ssh_key_manager_test.dart b/packages/fuchsia_ctl/test/ssh_key_manager_test.dart
index 03e5d21..1664da9 100644
--- a/packages/fuchsia_ctl/test/ssh_key_manager_test.dart
+++ b/packages/fuchsia_ctl/test/ssh_key_manager_test.dart
@@ -6,10 +6,10 @@
 import 'dart:io';
 
 import 'package:file/file.dart';
-import 'package:path/path.dart' as path;
 import 'package:file/memory.dart';
 import 'package:fuchsia_ctl/src/ssh_key_manager.dart';
 import 'package:mockito/mockito.dart';
+import 'package:path/path.dart' as path;
 import 'package:process/process.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/fuchsia_ctl/test/tar_test.dart b/packages/fuchsia_ctl/test/tar_test.dart
index 525ae4d..cfa0b31 100644
--- a/packages/fuchsia_ctl/test/tar_test.dart
+++ b/packages/fuchsia_ctl/test/tar_test.dart
@@ -5,10 +5,10 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:process/process.dart';
-import 'package:test/test.dart';
 import 'package:fuchsia_ctl/src/tar.dart';
 import 'package:mockito/mockito.dart';
+import 'package:process/process.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('Tar', () {
diff --git a/packages/imitation_game/bin/imitation_game.dart b/packages/imitation_game/bin/imitation_game.dart
index 3b2d44a..587546c 100644
--- a/packages/imitation_game/bin/imitation_game.dart
+++ b/packages/imitation_game/bin/imitation_game.dart
@@ -5,9 +5,10 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:mustache/mustache.dart';
-import 'package:imitation_game/readme_template.dart';
+
 import 'package:args/args.dart';
+import 'package:imitation_game/readme_template.dart';
+import 'package:mustache/mustache.dart';
 
 // ignore_for_file: avoid_as
 
diff --git a/packages/imitation_game/pubspec.yaml b/packages/imitation_game/pubspec.yaml
index fea3802..9194e60 100644
--- a/packages/imitation_game/pubspec.yaml
+++ b/packages/imitation_game/pubspec.yaml
@@ -1,9 +1,12 @@
 name: imitation_game
-version: 0.0.1
 description: Testing framework for comparing multiple frameworks' performance.
-homepage: https://github.com/flutter/packages/tree/master/packages/imitation_game
+repository: https://github.com/flutter/packages/tree/master/packages/imitation_game
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+imitation_game%22
+version: 0.0.1
+
+environment:
+  sdk: ">=2.7.0 <3.0.0"
+
 dependencies:
   args: ^1.6.0
   mustache: ^1.1.1
-environment:
-  sdk: ">=2.7.0 <3.0.0"
diff --git a/packages/metrics_center/pubspec.yaml b/packages/metrics_center/pubspec.yaml
index cc8fac0..681e3fe 100644
--- a/packages/metrics_center/pubspec.yaml
+++ b/packages/metrics_center/pubspec.yaml
@@ -1,9 +1,9 @@
 name: metrics_center
-version: 0.1.0
 description:
   Support multiple performance metrics sources/formats and destinations.
-homepage:
-  https://github.com/flutter/packages/tree/master/packages/metrics_center
+repository: https://github.com/flutter/packages/tree/master/packages/metrics_center
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+metrics_center%22
+version: 0.1.0
 
 environment:
   sdk: '>=2.10.0 <3.0.0'
diff --git a/packages/metrics_center/test/gcs_lock_test.dart b/packages/metrics_center/test/gcs_lock_test.dart
index 5be673a..6e9c1e9 100644
--- a/packages/metrics_center/test/gcs_lock_test.dart
+++ b/packages/metrics_center/test/gcs_lock_test.dart
@@ -4,9 +4,9 @@
 
 import 'dart:async';
 
-import 'package:googleapis/storage/v1.dart';
 import 'package:fake_async/fake_async.dart';
 import 'package:gcloud/storage.dart';
+import 'package:googleapis/storage/v1.dart';
 import 'package:googleapis_auth/auth_io.dart';
 import 'package:metrics_center/src/constants.dart';
 import 'package:metrics_center/src/gcs_lock.dart';
diff --git a/packages/metrics_center/test/google_benchmark_test.dart b/packages/metrics_center/test/google_benchmark_test.dart
index 7952bb7..85e36e6 100644
--- a/packages/metrics_center/test/google_benchmark_test.dart
+++ b/packages/metrics_center/test/google_benchmark_test.dart
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:metrics_center/src/constants.dart';
 import 'package:metrics_center/src/common.dart';
+import 'package:metrics_center/src/constants.dart';
 import 'package:metrics_center/src/google_benchmark.dart';
 
 import 'common.dart';
diff --git a/packages/metrics_center/test/skiaperf_test.dart b/packages/metrics_center/test/skiaperf_test.dart
index d84a547..dcfedf0 100644
--- a/packages/metrics_center/test/skiaperf_test.dart
+++ b/packages/metrics_center/test/skiaperf_test.dart
@@ -10,10 +10,9 @@
 import 'package:googleapis/storage/v1.dart' show DetailedApiRequestError;
 import 'package:googleapis_auth/auth_io.dart';
 import 'package:metrics_center/metrics_center.dart';
-import 'package:mockito/mockito.dart';
-
 import 'package:metrics_center/src/constants.dart';
 import 'package:metrics_center/src/gcs_lock.dart';
+import 'package:mockito/mockito.dart';
 
 import 'common.dart';
 import 'utility.dart';
diff --git a/packages/multicast_dns/pubspec.yaml b/packages/multicast_dns/pubspec.yaml
index c7c1a7b..285277e 100644
--- a/packages/multicast_dns/pubspec.yaml
+++ b/packages/multicast_dns/pubspec.yaml
@@ -1,13 +1,14 @@
 name: multicast_dns
 description: Dart package for mDNS queries (e.g. Bonjour, Avahi).
-homepage: https://github.com/flutter/packages/tree/master/packages/multicast_dns
+repository: https://github.com/flutter/packages/tree/master/packages/multicast_dns
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+multicast_dns%22
 version: 0.3.0
 
+environment:
+  sdk: ">=2.12.0 <3.0.0"
+
 dependencies:
   meta: ^1.3.0
 
 dev_dependencies:
   test: "^1.16.5"
-
-environment:
-  sdk: ">=2.12.0 <3.0.0"
diff --git a/packages/multicast_dns/test/decode_test.dart b/packages/multicast_dns/test/decode_test.dart
index ad2b585..c828dae 100644
--- a/packages/multicast_dns/test/decode_test.dart
+++ b/packages/multicast_dns/test/decode_test.dart
@@ -4,9 +4,9 @@
 
 import 'dart:io';
 
-import 'package:test/test.dart';
 import 'package:multicast_dns/src/packet.dart';
 import 'package:multicast_dns/src/resource_record.dart';
+import 'package:test/test.dart';
 
 const int _kSrvHeaderSize = 6;
 
diff --git a/packages/multicast_dns/test/lookup_resolver_test.dart b/packages/multicast_dns/test/lookup_resolver_test.dart
index e468f64..db3e3a3 100644
--- a/packages/multicast_dns/test/lookup_resolver_test.dart
+++ b/packages/multicast_dns/test/lookup_resolver_test.dart
@@ -4,9 +4,9 @@
 
 import 'dart:io';
 
-import 'package:test/test.dart';
 import 'package:multicast_dns/src/lookup_resolver.dart';
 import 'package:multicast_dns/src/resource_record.dart';
+import 'package:test/test.dart';
 
 void main() {
   testTimeout();
diff --git a/packages/multicast_dns/test/resource_record_cache_test.dart b/packages/multicast_dns/test/resource_record_cache_test.dart
index 644beef..21aed34 100644
--- a/packages/multicast_dns/test/resource_record_cache_test.dart
+++ b/packages/multicast_dns/test/resource_record_cache_test.dart
@@ -8,10 +8,10 @@
 
 import 'dart:io';
 
-import 'package:test/test.dart';
-import 'package:multicast_dns/src/resource_record.dart';
 import 'package:multicast_dns/src/native_protocol_client.dart'
     show ResourceRecordCache;
+import 'package:multicast_dns/src/resource_record.dart';
+import 'package:test/test.dart';
 
 void main() {
   testOverwrite();
diff --git a/packages/palette_generator/pubspec.yaml b/packages/palette_generator/pubspec.yaml
index 8bc401b..6c18d10 100644
--- a/packages/palette_generator/pubspec.yaml
+++ b/packages/palette_generator/pubspec.yaml
@@ -1,6 +1,7 @@
 name: palette_generator
 description: Flutter package for generating palette colors from a source image.
-homepage: https://github.com/flutter/packages/tree/master/packages/palette_generator
+repository: https://github.com/flutter/packages/tree/master/packages/palette_generator
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+palette_generator%22
 version: 0.3.0
 
 environment:
diff --git a/packages/palette_generator/test/palette_generator_test.dart b/packages/palette_generator/test/palette_generator_test.dart
index f28a420..e2de939 100644
--- a/packages/palette_generator/test/palette_generator_test.dart
+++ b/packages/palette_generator/test/palette_generator_test.dart
@@ -6,11 +6,11 @@
 import 'dart:typed_data';
 import 'dart:ui' as ui show Image, Codec, FrameInfo, instantiateImageCodec;
 
-import 'package:flutter_test/flutter_test.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
-import 'package:path/path.dart' as path;
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
 import 'package:palette_generator/palette_generator.dart';
+import 'package:path/path.dart' as path;
 
 /// An image provider implementation for testing that takes a pre-loaded image.
 /// This avoids handling asynchronous I/O in the test zone, which is
diff --git a/packages/pigeon/e2e_tests/test_objc/pubspec.yaml b/packages/pigeon/e2e_tests/test_objc/pubspec.yaml
index b66d931..eadb48d 100644
--- a/packages/pigeon/e2e_tests/test_objc/pubspec.yaml
+++ b/packages/pigeon/e2e_tests/test_objc/pubspec.yaml
@@ -1,5 +1,6 @@
 name: test_objc
 description: A new Flutter project.
+publish_to: none
 
 # The following defines the version and build number for your application.
 # A version number is three numbers separated by dots, like 1.2.43
diff --git a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/null_safe_test.mocks.dart b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/null_safe_test.mocks.dart
index 5a326b5..45fdc63 100644
--- a/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/null_safe_test.mocks.dart
+++ b/packages/pigeon/platform_tests/flutter_null_safe_unit_tests/test/null_safe_test.mocks.dart
@@ -12,6 +12,10 @@
 // ignore_for_file: comment_references
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: always_specify_types
+// Added manually; several methods have moved to
+// flutter_test/lib/src/deprecated.dart on master, but that hasn't reached
+// stable yet.
+// ignore_for_file: override_on_non_overriding_member
 
 /// A class which mocks [BinaryMessenger].
 ///
diff --git a/packages/pigeon/platform_tests/ios_unit_tests/pubspec.yaml b/packages/pigeon/platform_tests/ios_unit_tests/pubspec.yaml
index e5e7de4..125ae23 100644
--- a/packages/pigeon/platform_tests/ios_unit_tests/pubspec.yaml
+++ b/packages/pigeon/platform_tests/ios_unit_tests/pubspec.yaml
@@ -1,5 +1,6 @@
 name: ios_unit_tests
 description: A new Flutter project.
+publish_to: none
 
 # The following defines the version and build number for your application.
 # A version number is three numbers separated by dots, like 1.2.43
diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
index 06278fc..c442d4c 100644
--- a/packages/pigeon/pubspec.yaml
+++ b/packages/pigeon/pubspec.yaml
@@ -1,11 +1,15 @@
 name: pigeon
-version: 0.2.1 # This must match the version in lib/generator_tools.dart
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
-homepage: https://github.com/flutter/packages/tree/master/packages/pigeon
+repository: https://github.com/flutter/packages/tree/master/packages/pigeon
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Apigeon
+version: 0.2.1 # This must match the version in lib/generator_tools.dart
+
+environment:
+  sdk: '>=2.12.0 <3.0.0'
+
 dependencies:
   args: ^2.0.0
   path: ^1.8.0
+
 dev_dependencies:
   test: ^1.11.1
-environment:
-  sdk: '>=2.12.0 <3.0.0'
diff --git a/packages/pointer_interceptor/pubspec.yaml b/packages/pointer_interceptor/pubspec.yaml
index cee03bd..8b1832e 100644
--- a/packages/pointer_interceptor/pubspec.yaml
+++ b/packages/pointer_interceptor/pubspec.yaml
@@ -1,6 +1,7 @@
 name: pointer_interceptor
 description: A widget to prevent clicks from being swallowed by underlying HtmlElementViews on the web.
-repository: https://github.com/flutter/packages
+repository: https://github.com/flutter/packages/tree/master/packages/pointer_interceptor
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pointer_interceptor%22
 version: 0.9.0+1
 
 environment:
diff --git a/packages/web_benchmarks/lib/src/browser.dart b/packages/web_benchmarks/lib/src/browser.dart
index eee2ddc..2761c7c 100644
--- a/packages/web_benchmarks/lib/src/browser.dart
+++ b/packages/web_benchmarks/lib/src/browser.dart
@@ -7,8 +7,8 @@
 import 'dart:io' as io;
 import 'dart:math' as math;
 
-import 'package:path/path.dart' as path;
 import 'package:meta/meta.dart';
+import 'package:path/path.dart' as path;
 import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
 
 import 'common.dart';
diff --git a/packages/web_benchmarks/lib/src/recorder.dart b/packages/web_benchmarks/lib/src/recorder.dart
index 96fa229..4147c7c 100644
--- a/packages/web_benchmarks/lib/src/recorder.dart
+++ b/packages/web_benchmarks/lib/src/recorder.dart
@@ -8,14 +8,13 @@
 import 'dart:math' as math;
 import 'dart:ui';
 
-import 'package:meta/meta.dart';
-
-import 'package:flutter/gestures.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter/scheduler.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/rendering.dart';
+import 'package:flutter/scheduler.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
+import 'package:meta/meta.dart';
 
 import 'common.dart';
 
diff --git a/packages/web_benchmarks/pubspec.yaml b/packages/web_benchmarks/pubspec.yaml
index 7397ed1..771aee0 100644
--- a/packages/web_benchmarks/pubspec.yaml
+++ b/packages/web_benchmarks/pubspec.yaml
@@ -1,7 +1,8 @@
 name: web_benchmarks
 description: A benchmark harness for performance-testing Flutter apps in Chrome.
+repository: https://github.com/flutter/packages/tree/master/packages/web_benchmarks
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+web_benchmarks%22
 version: 0.0.5
-homepage: https://github.com/flutter/packages/tree/master/packages/web_benchmarks
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
diff --git a/packages/xdg_directories/pubspec.yaml b/packages/xdg_directories/pubspec.yaml
index 32ed40e..dd9f83b 100644
--- a/packages/xdg_directories/pubspec.yaml
+++ b/packages/xdg_directories/pubspec.yaml
@@ -1,7 +1,8 @@
 name: xdg_directories
 description: A Dart package for reading XDG directory configuration information on Linux.
+repository: https://github.com/flutter/packages/tree/master/packages/xdg_directories
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+xdg_directories%22
 version: 0.2.0
-homepage: https://github.com/flutter/packages/tree/master/packages/xdg_directories
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
diff --git a/packages/xdg_directories/test/xdg_directories_test.dart b/packages/xdg_directories/test/xdg_directories_test.dart
index 7f26b72..0c72124 100644
--- a/packages/xdg_directories/test/xdg_directories_test.dart
+++ b/packages/xdg_directories/test/xdg_directories_test.dart
@@ -5,11 +5,10 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:test/fake.dart';
-import 'package:test/test.dart';
 import 'package:path/path.dart' as path;
 import 'package:process/process.dart';
-
+import 'package:test/fake.dart';
+import 'package:test/test.dart';
 import 'package:xdg_directories/xdg_directories.dart' as xdg;
 
 void main() {
diff --git a/third_party/packages/bsdiff/example/pubspec.yaml b/third_party/packages/bsdiff/example/pubspec.yaml
index dd9bbc9..6be6d6e 100644
--- a/third_party/packages/bsdiff/example/pubspec.yaml
+++ b/third_party/packages/bsdiff/example/pubspec.yaml
@@ -3,9 +3,9 @@
 version: 0.1.0
 publish_to: none
 
+environment:
+  sdk: ">=2.1.1-dev.2.0 <3.0.0"
+
 dependencies:
   bsdiff:
     path: ..
-
-environment:
-  sdk: ">=2.1.1-dev.2.0 <3.0.0"
diff --git a/third_party/packages/bsdiff/pubspec.yaml b/third_party/packages/bsdiff/pubspec.yaml
index 519f611..dac9a86 100644
--- a/third_party/packages/bsdiff/pubspec.yaml
+++ b/third_party/packages/bsdiff/pubspec.yaml
@@ -1,10 +1,11 @@
 name: bsdiff
 description: Binary diff/patch algorithm based on bsdiff by Colin Percival.
-homepage: https://github.com/flutter/packages/tree/master/third_party/packages/bsdiff
+repository: https://github.com/flutter/packages/tree/master/third_party/packages/bsdiff
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+bsdiff%22
 version: 0.1.0
 
-dev_dependencies:
-  test: "^1.3.4"
-
 environment:
   sdk: ">=2.1.2 <3.0.0"
+
+dev_dependencies:
+  test: "^1.3.4"
diff --git a/third_party/packages/cupertino_icons/pubspec.yaml b/third_party/packages/cupertino_icons/pubspec.yaml
index d3098c5..dba9b5d 100644
--- a/third_party/packages/cupertino_icons/pubspec.yaml
+++ b/third_party/packages/cupertino_icons/pubspec.yaml
@@ -1,14 +1,15 @@
 name: cupertino_icons
 
 description: Default icons asset for Cupertino widgets based on Apple styled icons
-homepage: https://github.com/flutter/packages/tree/master/third_party/packages/cupertino_icons
+repository: https://github.com/flutter/packages/tree/master/third_party/packages/cupertino_icons
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+cupertino_icons%22
 version: 1.0.3
 
+environment:
+  sdk: ">=2.12.0 <3.0.0"
+
 flutter:
   fonts:
     - family: CupertinoIcons
       fonts:
         - asset: assets/CupertinoIcons.ttf
-
-environment:
-  sdk: ">=2.12.0 <3.0.0"