diff --git a/analysis_options.yaml b/analysis_options.yaml
index 9c7a7787..5b4d42c7 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -88,14 +88,13 @@ linter:
     - flutter_style_todos
     - hash_and_equals
     - implementation_imports
-    - iterable_contains_unrelated_type
+    - collection_methods_unrelated_type
     - join_return_with_assignment
     - leading_newlines_in_multiline_strings
     - library_names
     - library_prefixes
     - library_private_types_in_public_api
     - lines_longer_than_80_chars
-    - list_remove_unrelated_type
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
diff --git a/lib/builder.dart b/lib/builder.dart
index 8a87d43a..f04883df 100644
--- a/lib/builder.dart
+++ b/lib/builder.dart
@@ -9,7 +9,7 @@ Builder configBuilder(final BuilderOptions options) => _ConfigBuilder();
 class _ConfigBuilder extends Builder {
   @override
   Map<String, List<String>> get buildExtensions => <String, List<String>>{
-        '.yaml': <String>['.dart']
+        '.yaml': <String>['.dart'],
       };
 
   static const String _defaultConfigFileName = 'coap_config';
diff --git a/lib/src/option/uri_converters.dart b/lib/src/option/uri_converters.dart
index 1f182b82..d4522c45 100644
--- a/lib/src/option/uri_converters.dart
+++ b/lib/src/option/uri_converters.dart
@@ -156,7 +156,7 @@ List<Option<Object?>> uriToOptions(
 /// Converts a relative [location] URI into a list of [Option]s.
 List<Option<Object?>> locationToOptions(final Uri location) => [
       ..._uriPathsToOptions<LocationPathOption>(location),
-      ..._uriQueriesToOptions<LocationQueryOption>(location)
+      ..._uriQueriesToOptions<LocationQueryOption>(location),
     ];
 
 /// Converts a [uri]'s path components into a list of [PathOption]s as specified
@@ -172,10 +172,10 @@ List<Option<Object?>> _uriPathsToOptions<T extends PathOption>(final Uri uri) {
 
     for (final optionValue in optionValues.skip(1)) {
       switch (T) {
-        case UriPathOption:
+        case const (UriPathOption):
           options.add(UriPathOption(optionValue));
           continue;
-        case LocationPathOption:
+        case const (LocationPathOption):
           options.add(LocationPathOption(optionValue));
           continue;
       }
@@ -207,10 +207,10 @@ List<Option<Object?>> _uriQueriesToOptions<T extends QueryOption>(
     final optionValue = components.map(Uri.decodeFull).join('=');
 
     switch (T) {
-      case UriQueryOption:
+      case const (UriQueryOption):
         options.add(UriQueryOption(optionValue));
         continue;
-      case LocationQueryOption:
+      case const (LocationQueryOption):
         options.add(LocationQueryOption(optionValue));
         continue;
     }
diff --git a/pubspec.yaml b/pubspec.yaml
index cde61266..96aee2d9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -24,6 +24,6 @@ dependencies:
   yaml: ^3.1.2
 
 dev_dependencies:
-  build_runner: ^2.4.4
-  lints: ^2.1.0
-  test: ^1.24.3
+  build_runner: ^2.4.7
+  lints: ^3.0.0
+  test: ^1.25.0
diff --git a/test/coap_message_encode_decode_test.dart b/test/coap_message_encode_decode_test.dart
index 4b958510..dbf246cc 100644
--- a/test/coap_message_encode_decode_test.dart
+++ b/test/coap_message_encode_decode_test.dart
@@ -206,7 +206,7 @@ void main() {
         3,
         116,
         101,
-        110
+        110,
       ]
     ];