From f28092d14edd16ad60764af637baf35e3e60dcde Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@users.noreply.github.com>
Date: Wed, 24 Jan 2024 14:14:46 -0800
Subject: [PATCH] Update lints, require Dart 3.2
 (dart-lang/http_multi_server#63)

---
 pkgs/http_multi_server/.github/workflows/test-package.yml | 2 +-
 pkgs/http_multi_server/CHANGELOG.md                       | 4 ++--
 pkgs/http_multi_server/analysis_options.yaml              | 8 +-------
 pkgs/http_multi_server/pubspec.yaml                       | 8 ++++----
 pkgs/http_multi_server/test/http_multi_server_test.dart   | 4 ++--
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/http_multi_server/.github/workflows/test-package.yml b/pkgs/http_multi_server/.github/workflows/test-package.yml
index d30c27bd91..89c7e63566 100644
--- a/pkgs/http_multi_server/.github/workflows/test-package.yml
+++ b/pkgs/http_multi_server/.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.19.0, dev]
+        sdk: [3.2, dev]
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - uses: dart-lang/setup-dart@ca7e6fee45ffbd82b555a7ebfc236d2c86439f5b
diff --git a/pkgs/http_multi_server/CHANGELOG.md b/pkgs/http_multi_server/CHANGELOG.md
index 70b7abdeb1..4ea18f20dc 100644
--- a/pkgs/http_multi_server/CHANGELOG.md
+++ b/pkgs/http_multi_server/CHANGELOG.md
@@ -1,6 +1,6 @@
-## 3.2.2-dev
+## 3.2.2-wip
 
-* Require Dart 2.19
+* Require Dart 3.2
 
 ## 3.2.1
 
diff --git a/pkgs/http_multi_server/analysis_options.yaml b/pkgs/http_multi_server/analysis_options.yaml
index 9076448b3d..0154535551 100644
--- a/pkgs/http_multi_server/analysis_options.yaml
+++ b/pkgs/http_multi_server/analysis_options.yaml
@@ -1,3 +1,4 @@
+# https://dart.dev/tools/analysis#the-analysis-options-file
 include: package:dart_flutter_team_lints/analysis_options.yaml
 
 analyzer:
@@ -10,23 +11,16 @@ linter:
   - avoid_classes_with_only_static_members
   - avoid_private_typedef_functions
   - avoid_redundant_argument_values
-  - avoid_returning_null
-  - avoid_returning_null_for_future
   - avoid_returning_this
   - avoid_unused_constructor_parameters
   - cancel_subscriptions
   - cascade_invocations
-  - comment_references
   - join_return_with_assignment
   - literal_only_boolean_expressions
   - no_adjacent_strings_in_list
   - no_runtimeType_toString
   - package_api_docs
-  - prefer_const_constructors
   - prefer_const_declarations
   - prefer_expression_function_bodies
   - prefer_final_locals
-  - prefer_relative_imports
-  - test_types_in_equals
   - use_string_buffers
-  - use_super_parameters
diff --git a/pkgs/http_multi_server/pubspec.yaml b/pkgs/http_multi_server/pubspec.yaml
index 9220548c17..992ee00476 100644
--- a/pkgs/http_multi_server/pubspec.yaml
+++ b/pkgs/http_multi_server/pubspec.yaml
@@ -1,17 +1,17 @@
 name: http_multi_server
-version: 3.2.2-dev
+version: 3.2.2-wip
 description: >-
   A dart:io HttpServer wrapper that handles requests from multiple servers.
 repository: https://github.com/dart-lang/http_multi_server
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.2.0
 
 dependencies:
   async: ^2.5.0
 
 dev_dependencies:
-  dart_flutter_team_lints: ^1.0.0
-  http: ^0.13.0
+  dart_flutter_team_lints: ^2.0.0
+  http: ^1.0.0
   shelf: ^1.4.0
   test: ^1.16.0
diff --git a/pkgs/http_multi_server/test/http_multi_server_test.dart b/pkgs/http_multi_server/test/http_multi_server_test.dart
index 62f5b772e6..a644348cbb 100644
--- a/pkgs/http_multi_server/test/http_multi_server_test.dart
+++ b/pkgs/http_multi_server/test/http_multi_server_test.dart
@@ -128,8 +128,8 @@ void main() {
 
     test('connectionsInfo sums the values for all servers', () {
       var pendingRequests = 0;
-      final awaitingResponseCompleter = Completer();
-      final sendResponseCompleter = Completer();
+      final awaitingResponseCompleter = Completer<void>();
+      final sendResponseCompleter = Completer<void>();
       multiServer.listen((request) {
         sendResponseCompleter.future.then((_) {
           request.response.write('got request');