commit c1531e295d5a64c2740a805842a52ed7e2f8fd8f
author Michael Thomsen <mit@google.com> Mon Sep 13 14:06:47 2021 +0200
committer Michael Thomsen <mit@google.com> Mon Sep 13 14:06:47 2021 +0200
tree 2d18ebe6a01c4afca1afd883c19043808cbd7604
parent 0061cdb33d393d3732ff897c1e6d10911369d927

Switch to package:lints

pkgs/package_config/analysis_options.yaml

diff --git a/pkgs/package_config/analysis_options.yaml b/pkgs/package_config/analysis_options.yaml
index a0ba68d..278ec48 100644
--- a/pkgs/package_config/analysis_options.yaml
+++ b/pkgs/package_config/analysis_options.yaml
@@ -2,4 +2,4 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
-include: package:pedantic/analysis_options.1.9.0.yaml
+include: package:lints/recommended.yaml

pkgs/package_config/lib/src/package_config_json.dart

diff --git a/pkgs/package_config/lib/src/package_config_json.dart b/pkgs/package_config/lib/src/package_config_json.dart
index 1998b66..fe185a2 100644
--- a/pkgs/package_config/lib/src/package_config_json.dart
+++ b/pkgs/package_config/lib/src/package_config_json.dart
@@ -35,7 +35,7 @@
 PackageConfig parsePackageConfigBytes(
     Uint8List bytes, Uri file, void Function(Object error) onError) {
   // TODO(lrn): Make this simpler. Maybe parse directly from bytes.
-  var jsonObject;
+  Object? jsonObject;
   try {
     jsonObject = _jsonUtf8Decoder.convert(bytes);
   } on FormatException catch (e) {
@@ -47,7 +47,7 @@
 
 PackageConfig parsePackageConfigString(
     String source, Uri file, void Function(Object error) onError) {
-  var jsonObject;
+  Object? jsonObject;
   try {
     jsonObject = jsonDecode(source);
   } on FormatException catch (e) {

pkgs/package_config/pubspec.yaml

diff --git a/pkgs/package_config/pubspec.yaml b/pkgs/package_config/pubspec.yaml
index 5cc9cc0..e7c9a0a 100644
--- a/pkgs/package_config/pubspec.yaml
+++ b/pkgs/package_config/pubspec.yaml
@@ -13,5 +13,5 @@
   build_runner: ^2.0.0
   build_test: ^2.1.2
   build_web_compilers: ^3.0.0
-  pedantic: ^1.10.0
+  lints: ^1.0.0
   test: ^1.16.0

pkgs/package_config/test/discovery_test.dart

diff --git a/pkgs/package_config/test/discovery_test.dart b/pkgs/package_config/test/discovery_test.dart
index d2c3d83..4a1bba0 100644
--- a/pkgs/package_config/test/discovery_test.dart
+++ b/pkgs/package_config/test/discovery_test.dart
@@ -99,8 +99,7 @@
       '.packages': packagesFile,
       'subdir': {'script.dart': 'main(){}'}
     }, (Directory directory) async {
-      var config;
-      config = await findPackageConfig(subdir(directory, 'subdir/'));
+      var config = (await findPackageConfig(subdir(directory, 'subdir/')))!;
       expect(config.version, 1);
       validatePackagesFile(config, directory);
     });

pkgs/package_config/test/discovery_uri_test.dart

diff --git a/pkgs/package_config/test/discovery_uri_test.dart b/pkgs/package_config/test/discovery_uri_test.dart
index 0a9b917..e487e47 100644
--- a/pkgs/package_config/test/discovery_uri_test.dart
+++ b/pkgs/package_config/test/discovery_uri_test.dart
@@ -98,9 +98,8 @@
       '.packages': packagesFile,
       'subdir': {'script.dart': 'main(){}'}
     }, (directory, loader) async {
-      var config;
-      config = await findPackageConfigUri(directory.resolve('subdir/'),
-          loader: loader);
+      var config = (await findPackageConfigUri(directory.resolve('subdir/'),
+          loader: loader))!;
       expect(config.version, 1);
       validatePackagesFile(config, directory);
     });