From 641efe306b9bee0750e2762c1260b76aa00e9519 Mon Sep 17 00:00:00 2001
From: Parker Lougheed <parlough@gmail.com>
Date: Mon, 7 Oct 2024 19:14:19 -0500
Subject: [PATCH] Clean up duplicate lints

---
 analysis_options.yaml                  | 18 +-----------------
 lib/src/authentication/credential.dart |  2 +-
 lib/src/command/add.dart               | 14 ++++++++------
 pubspec.lock                           | 22 +++++++++++-----------
 pubspec.yaml                           |  2 +-
 test/help_test.dart                    |  3 ++-
 6 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index fb93ce7c4..715ebeab2 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -12,36 +12,20 @@ analyzer:
 
 linter:
   rules:
-    - always_declare_return_types
-    - avoid_catching_errors
     - avoid_print
     - avoid_private_typedef_functions
     - avoid_redundant_argument_values
     - avoid_unused_constructor_parameters
     - avoid_void_async
     - cancel_subscriptions
-    - directives_ordering
-    - library_annotations
+    - missing_code_block_language_in_doc_comment
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
     - no_runtimeType_toString
-    - omit_local_variable_types
-    - only_throw_errors
     - package_api_docs
-    - prefer_asserts_in_initializer_lists
     - prefer_const_declarations
     - prefer_final_locals
-    - prefer_relative_imports
-    - prefer_single_quotes
     - require_trailing_commas
-    - sort_pub_dependencies
-    - test_types_in_equals
-    - throw_in_finally
-    - type_annotate_public_apis
     - unawaited_futures
-    - unnecessary_lambdas
-    - unnecessary_library_directive
-    - unnecessary_parenthesis
-    - unnecessary_statements
     - unreachable_from_main
     - use_enums
diff --git a/lib/src/authentication/credential.dart b/lib/src/authentication/credential.dart
index 5e51754cc..a69beef07 100644
--- a/lib/src/authentication/credential.dart
+++ b/lib/src/authentication/credential.dart
@@ -27,7 +27,7 @@ import '../utils.dart';
 ///
 /// or
 ///
-/// /// ```json
+/// ```json
 /// {
 ///   "url": "https://example.com/",
 ///   "env": "TOKEN_ENV_VAR"
diff --git a/lib/src/command/add.dart b/lib/src/command/add.dart
index 5e098b213..5fe7f048a 100644
--- a/lib/src/command/add.dart
+++ b/lib/src/command/add.dart
@@ -448,7 +448,8 @@ Specify multiple sdk packages with descriptors.''');
   /// description is issued.
   ///
   /// Examples:
-  /// ```
+  ///
+  /// ```none
   /// retry
   /// retry:2.0.0
   /// retry:^2.0.0
@@ -579,7 +580,8 @@ Specify multiple sdk packages with descriptors.''');
   ///
   ///
   /// Examples:
-  /// ```
+  ///
+  /// ```none
   /// retry
   /// retry:2.0.0
   /// dev:retry:^2.0.0
@@ -593,14 +595,14 @@ Specify multiple sdk packages with descriptors.''');
   /// 'retry:{"hosted":"mypub.dev"}'
   /// ```
   ///
-  /// The --path --sdk and --git-<option> arguments cannot be combined with a
-  /// non-string descriptor.
+  /// The `--path`, `--sdk`, and `--git-<option>` arguments can't be
+  /// combined with a non-string descriptor.
   ///
   /// If a version constraint is provided when the `--path` or any of the
-  /// `--git-<option>` options are used, a [usageException] will be thrown.
+  /// `--git-<option>` options are used, a [UsageException] will be thrown.
   ///
   /// Packages must either be a git, hosted, sdk, or path package. Mixing of
-  /// options is not allowed and will cause a [usageException] to be thrown.
+  /// options is not allowed and will cause a [UsageException] to be thrown.
   ///
   /// If any of the other git options are defined when `--git-url` is not
   /// defined, an error will be thrown.
diff --git a/pubspec.lock b/pubspec.lock
index e20fe4db8..dff072b5a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,23 +5,23 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: f6dbf021f4b214d85c79822912c5fcd142a2c4869f01222ad371bc51f9f1c356
+      sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77"
       url: "https://pub.dev"
     source: hosted
-    version: "74.0.0"
+    version: "73.0.0"
   _macros:
     dependency: transitive
     description: dart
     source: sdk
-    version: "0.3.3"
+    version: "0.3.2"
   analyzer:
     dependency: "direct main"
     description:
       name: analyzer
-      sha256: f7e8caf82f2d3190881d81012606effdf8a38e6c1ab9e30947149733065f817c
+      sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a"
       url: "https://pub.dev"
     source: hosted
-    version: "6.9.0"
+    version: "6.8.0"
   args:
     dependency: "direct main"
     description:
@@ -98,10 +98,10 @@ packages:
     dependency: "direct dev"
     description:
       name: dart_flutter_team_lints
-      sha256: "084338b81e33917c7c180da7aaccb59a5e5d16ece372465c6a2b930841b9009a"
+      sha256: c6c9c89f4038a64063b67166b2d291d19697a73e111afa42ddcf1840c410c08e
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   file:
     dependency: transitive
     description:
@@ -178,10 +178,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   logging:
     dependency: transitive
     description:
@@ -194,10 +194,10 @@ packages:
     dependency: transitive
     description:
       name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3-main.0"
+    version: "0.1.2-main.4"
   matcher:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 5ff42ae3d..bd5fb0dcc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -30,7 +30,7 @@ dependencies:
 
 dev_dependencies:
   checks: ^0.3.0
-  dart_flutter_team_lints: ^3.1.0
+  dart_flutter_team_lints: ^3.2.1
   shelf_test_handler: ^2.0.2
   test: ^1.24.9
   test_descriptor: ^2.0.1
diff --git a/test/help_test.dart b/test/help_test.dart
index 3e0a0f370..3f27ff415 100644
--- a/test/help_test.dart
+++ b/test/help_test.dart
@@ -10,7 +10,8 @@ import 'golden_file.dart';
 /// Extract all commands and subcommands.
 ///
 /// Result will be an iterable of lists, illustrated as follows:
-/// ```
+///
+/// ```none
 /// [
 ///   [pub]
 ///   [pub, get]