From c5bda00011e6e6607c8e8f71fb57db75d04c0616 Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Tue, 28 Nov 2023 11:26:55 -0800
Subject: [PATCH] Move to latest lints, require Dart 3.1

---
 .github/workflows/test-package.yml |  2 +-
 CHANGELOG.md                       |  4 ++++
 analysis_options.yaml              | 25 +------------------------
 pubspec.yaml                       |  6 +++---
 4 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
index 6878c5c..77ba45b 100644
--- a/.github/workflows/test-package.yml
+++ b/.github/workflows/test-package.yml
@@ -47,7 +47,7 @@ jobs:
       matrix:
         # Add macos-latest and/or windows-latest if relevant for this package.
         os: [ubuntu-latest]
-        sdk: [2.18.0, dev]
+        sdk: [3.1.0, dev]
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17812f6..f46c161 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.10.1-wip
+
+* Require Dart 3.1
+
 ## 1.10.0
 
 * Add a `SourceFile.codeUnits` property.
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 8b32d10..ae73fa5 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,5 +1,5 @@
 # https://dart.dev/guides/language/analysis-options
-include: package:lints/recommended.yaml
+include: package:dart_flutter_team_lints/analysis_options.yaml
 
 analyzer:
   language:
@@ -9,48 +9,25 @@ analyzer:
 
 linter:
   rules:
-  - always_declare_return_types
   - avoid_bool_literals_in_conditional_expressions
-  - avoid_catching_errors
   - avoid_classes_with_only_static_members
-  - avoid_dynamic_calls
   - avoid_private_typedef_functions
   - avoid_redundant_argument_values
-  - avoid_returning_null
-  - avoid_returning_null_for_future
   - avoid_returning_this
   - avoid_unused_constructor_parameters
   - avoid_void_async
   - cancel_subscriptions
   - cascade_invocations
-  - comment_references
-  - directives_ordering
   - join_return_with_assignment
-  - lines_longer_than_80_chars
   - literal_only_boolean_expressions
   - missing_whitespace_between_adjacent_strings
   - no_adjacent_strings_in_list
-  - omit_local_variable_types
-  - only_throw_errors
   - package_api_docs
-  - prefer_asserts_in_initializer_lists
-  - prefer_const_constructors
   - prefer_const_declarations
   - prefer_expression_function_bodies
   - prefer_final_locals
-  - prefer_relative_imports
-  - prefer_single_quotes
-  - sort_pub_dependencies
-  - test_types_in_equals
-  - throw_in_finally
-  - type_annotate_public_apis
-  - unawaited_futures
   - unnecessary_await_in_return
-  - unnecessary_lambdas
-  - unnecessary_parenthesis
   - unnecessary_raw_strings
-  - unnecessary_statements
   - use_if_null_to_convert_nulls_to_bools
   - use_raw_strings
   - use_string_buffers
-  - use_super_parameters
diff --git a/pubspec.yaml b/pubspec.yaml
index 44156ee..45804e7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,11 @@
 name: source_span
-version: 1.10.0
+version: 1.10.1-wip
 description: >-
   Provides a standard representation for source code locations and spans.
 repository: https://github.com/dart-lang/source_span
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ^3.1.0
 
 dependencies:
   collection: ^1.15.0
@@ -13,5 +13,5 @@ dependencies:
   term_glyph: ^1.2.0
 
 dev_dependencies:
-  lints: ^2.0.0
+  dart_flutter_team_lints: ^2.0.0
   test: ^1.16.0