diff --git a/pkgs/convert/CHANGELOG.md b/pkgs/convert/CHANGELOG.md
index 925b1d67..00b795de 100644
--- a/pkgs/convert/CHANGELOG.md
+++ b/pkgs/convert/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 3.1.2-dev
+## 3.1.2-wip
 
 - Require Dart 3.0
 - Add chunked decoding support (`startChunkedConversion`) for `CodePage`
diff --git a/pkgs/convert/analysis_options.yaml b/pkgs/convert/analysis_options.yaml
index 6c58fa83..20982383 100644
--- a/pkgs/convert/analysis_options.yaml
+++ b/pkgs/convert/analysis_options.yaml
@@ -13,17 +13,12 @@ linter:
     - avoid_unused_constructor_parameters
     - avoid_void_async
     - cancel_subscriptions
-    - comment_references
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
     - no_runtimeType_toString
     - package_api_docs
-    - prefer_const_constructors
     - prefer_const_declarations
     - prefer_expression_function_bodies
-    - prefer_relative_imports
-    - test_types_in_equals
     - unnecessary_await_in_return
     - use_string_buffers
-    - use_super_parameters
diff --git a/pkgs/convert/pubspec.yaml b/pkgs/convert/pubspec.yaml
index 77a7edb1..59d6f9df 100644
--- a/pkgs/convert/pubspec.yaml
+++ b/pkgs/convert/pubspec.yaml
@@ -1,17 +1,17 @@
 name: convert
-version: 3.1.2-dev
+version: 3.1.2-wip
 description: >-
   Utilities for converting between data representations.
   Provides a number of Sink, Codec, Decoder, and Encoder types.
 repository: https://github.com/dart-lang/convert
 
 environment:
-  sdk: '^3.0.0'
+  sdk: ^3.0.0
 
 dependencies:
   typed_data: ^1.3.0
 
 dev_dependencies:
   benchmark_harness: ^2.2.0
-  dart_flutter_team_lints: ^1.0.0
+  dart_flutter_team_lints: ^2.0.0
   test: ^1.17.0
diff --git a/pkgs/convert/test/hex_test.dart b/pkgs/convert/test/hex_test.dart
index 7632cb18..abd940f6 100644
--- a/pkgs/convert/test/hex_test.dart
+++ b/pkgs/convert/test/hex_test.dart
@@ -147,16 +147,16 @@ void main() {
         expect(results, isEmpty);
 
         sink.add('0');
-        expect(results, equals([[]]));
+        expect(results, equals([<Never>[]]));
 
         sink.add('');
-        expect(results, equals([[]]));
+        expect(results, equals([<Never>[]]));
 
         sink.add('0');
         expect(
             results,
             equals([
-              [],
+              <Never>[],
               [0x00]
             ]));
 
@@ -164,7 +164,7 @@ void main() {
         expect(
             results,
             equals([
-              [],
+              <Never>[],
               [0x00]
             ]));
       });
diff --git a/pkgs/convert/test/percent_test.dart b/pkgs/convert/test/percent_test.dart
index cc74a69e..4e0f605d 100644
--- a/pkgs/convert/test/percent_test.dart
+++ b/pkgs/convert/test/percent_test.dart
@@ -154,22 +154,22 @@ void main() {
         expect(results, isEmpty);
 
         sink.add('%');
-        expect(results, equals([[]]));
+        expect(results, equals([<Never>[]]));
 
         sink.add('');
-        expect(results, equals([[]]));
+        expect(results, equals([<Never>[]]));
 
         sink.add('2');
-        expect(results, equals([[]]));
+        expect(results, equals([<Never>[]]));
 
         sink.add('');
-        expect(results, equals([[]]));
+        expect(results, equals([<Never>[]]));
 
         sink.add('0');
         expect(
             results,
             equals([
-              [],
+              <Never>[],
               [0x20]
             ]));
       });