From 757ccac589cf4d89a479e5d93c88d903225183ab Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Wed, 28 May 2025 13:38:07 -0700
Subject: [PATCH 1/2] team lints: update to latest pkg:lints

Update min SDK
Format for latest SDK
Prepare v3.5.2 for release
---
 .github/workflows/dart_flutter_team_lints.yml |  4 ++--
 pkgs/dart_flutter_team_lints/CHANGELOG.md     |  5 +++++
 pkgs/dart_flutter_team_lints/pubspec.yaml     |  8 ++++----
 pkgs/dart_flutter_team_lints/tool/dedup.dart  | 16 +++++++---------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/dart_flutter_team_lints.yml b/.github/workflows/dart_flutter_team_lints.yml
index 5f2943f4..6395ba2c 100644
--- a/.github/workflows/dart_flutter_team_lints.yml
+++ b/.github/workflows/dart_flutter_team_lints.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [dev] # TODO: add back in stable
+        sdk: [3.8, dev]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
@@ -38,6 +38,6 @@ jobs:
       - run: dart analyze --fatal-infos
 
       - run: dart format --output=none --set-exit-if-changed .
-        if: ${{ matrix.sdk == 'stable' }}
+        if: ${{ matrix.sdk == 'dev' }}
 
       - run: dart test
diff --git a/pkgs/dart_flutter_team_lints/CHANGELOG.md b/pkgs/dart_flutter_team_lints/CHANGELOG.md
index e7dfdb0e..8ce31c22 100644
--- a/pkgs/dart_flutter_team_lints/CHANGELOG.md
+++ b/pkgs/dart_flutter_team_lints/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.5.2
+
+- Depend on the `6.0.0` release of `package:lints`.
+- Require Dart `3.8`
+
 ## 3.5.1
 
 - Removed `discarded_futures`; this produced more results than expected.
diff --git a/pkgs/dart_flutter_team_lints/pubspec.yaml b/pkgs/dart_flutter_team_lints/pubspec.yaml
index b711ce05..6cc5286a 100644
--- a/pkgs/dart_flutter_team_lints/pubspec.yaml
+++ b/pkgs/dart_flutter_team_lints/pubspec.yaml
@@ -1,17 +1,17 @@
 name: dart_flutter_team_lints
 description: An analysis rule set used by the Dart and Flutter teams.
-version: 3.5.1
+version: 3.5.2
 repository: https://github.com/dart-lang/ecosystem/tree/main/pkgs/dart_flutter_team_lints
 issue_tracker: https://github.com/dart-lang/ecosystem/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Adart_flutter_team_lints
 
 environment:
-  sdk: ^3.7.0
+  sdk: ^3.8.0
 
 dependencies:
-  lints: ^5.0.0
+  lints: ^6.0.0
 
 dev_dependencies:
   checks: ^0.3.0
   path: ^1.8.0
-  test: ^1.0.0
+  test: ^1.24.0
   yaml: ^3.0.0
diff --git a/pkgs/dart_flutter_team_lints/tool/dedup.dart b/pkgs/dart_flutter_team_lints/tool/dedup.dart
index d39139d5..84017d15 100644
--- a/pkgs/dart_flutter_team_lints/tool/dedup.dart
+++ b/pkgs/dart_flutter_team_lints/tool/dedup.dart
@@ -77,8 +77,9 @@ Map<String, Directory>? _findPackageConfig(Directory dir) {
     return null;
   }
 
-  final configFile =
-      File(path.join(dir.path, '.dart_tool', 'package_config.json'));
+  final configFile = File(
+    path.join(dir.path, '.dart_tool', 'package_config.json'),
+  );
   if (configFile.existsSync()) {
     return _parseConfigFile(configFile);
   } else {
@@ -122,8 +123,9 @@ class Lints {
     final lints = (yaml['linter'] as YamlMap?)?['rules'] as YamlList;
 
     return Lints._(
-      parent:
-          localInclude == null ? null : Lints.readFrom(localInclude, packages),
+      parent: localInclude == null
+          ? null
+          : Lints.readFrom(localInclude, packages),
       include: include,
       lints: lints.cast<String>().toList(),
     );
@@ -133,11 +135,7 @@ class Lints {
   final String include;
   final List<String> lints;
 
-  Lints._({
-    this.parent,
-    required this.include,
-    required this.lints,
-  });
+  Lints._({this.parent, required this.include, required this.lints});
 
   Lints? containingInclude(String lint) {
     if (lints.contains(lint)) return this;

From a82c79b69a3c9c4340dd4c6eb88d937c1469fe0c Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Wed, 28 May 2025 14:18:32 -0700
Subject: [PATCH 2/2] remove dupes

---
 pkgs/dart_flutter_team_lints/lib/analysis_options.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/dart_flutter_team_lints/lib/analysis_options.yaml b/pkgs/dart_flutter_team_lints/lib/analysis_options.yaml
index 1a53b101..5a383334 100644
--- a/pkgs/dart_flutter_team_lints/lib/analysis_options.yaml
+++ b/pkgs/dart_flutter_team_lints/lib/analysis_options.yaml
@@ -45,10 +45,8 @@ linter:
     - comment_references
     - conditional_uri_does_not_exist
     - only_throw_errors
-    - strict_top_level_inference
     - test_types_in_equals
     - throw_in_finally
     - type_annotate_public_apis
     - unawaited_futures
-    - unnecessary_underscores
     - unreachable_from_main