diff --git a/analysis_options.yaml b/analysis_options.yaml
index 1421ef5bcb..37f1c95755 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -8,10 +8,6 @@ analyzer:
     missing_return: warning
     # allow having TODOs in the code
     todo: ignore
-    # Ignore analyzer hints for updating pubspecs when using Future or
-    # Stream and not importing dart:async
-    # Please see https://github.com/flutter/flutter/pull/24528 for details.
-    sdk_version_async_exported_from_core: ignore
   exclude:
     - "bin/cache/**"
     # the following two are relative to the stocks example and the flutter package respectively
@@ -55,10 +51,9 @@ linter:
     - flutter_style_todos
     - hash_and_equals
     - implementation_imports
-    - iterable_contains_unrelated_type
+    - collection_methods_unrelated_type
     - library_names
     - library_prefixes
-    - list_remove_unrelated_type
     - no_adjacent_strings_in_list
     - no_duplicate_case_values
     - non_constant_identifier_names
diff --git a/lib/ios.dart b/lib/ios.dart
index 1339de35e3..5fad0e7da2 100644
--- a/lib/ios.dart
+++ b/lib/ios.dart
@@ -197,7 +197,7 @@ void modifyContentsFile(String newIconName) {
 String generateContentsFileAsString(String newIconName) {
   final Map<String, dynamic> contentJson = <String, dynamic>{
     'images': createImageList(newIconName),
-    'info': ContentsInfoObject(version: 1, author: 'xcode').toJson()
+    'info': ContentsInfoObject(version: 1, author: 'xcode').toJson(),
   };
   return json.encode(contentJson);
 }
@@ -220,7 +220,7 @@ class ContentsImageObject {
       'size': size,
       'idiom': idiom,
       'filename': filename,
-      'scale': scale
+      'scale': scale,
     };
   }
 }
@@ -390,7 +390,7 @@ List<Map<String, String>> createImageList(String fileNamePrefix) {
       idiom: 'ios-marketing',
       filename: '$fileNamePrefix-1024x1024@1x.png',
       scale: '1x',
-    ).toJson()
+    ).toJson(),
   ];
   return imageList;
 }
diff --git a/test/android_test.dart b/test/android_test.dart
index c621998d0a..f65fb8b8de 100644
--- a/test/android_test.dart
+++ b/test/android_test.dart
@@ -32,7 +32,7 @@ void main() {
     final Map<String, dynamic> flutterIconsConfig = <String, dynamic>{
       'image_path': 'assets/images/icon-710x599.png',
       'android': true,
-      'ios': true
+      'ios': true,
     };
     expect(
       Config.fromJson(flutterIconsConfig).isCustomAndroidFile,
@@ -42,7 +42,7 @@ void main() {
     final Map<String, dynamic> flutterIconsNewIconConfig = <String, dynamic>{
       'image_path': 'assets/images/icon-710x599.png',
       'android': 'New Icon',
-      'ios': true
+      'ios': true,
     };
     expect(
       Config.fromJson(flutterIconsNewIconConfig).isCustomAndroidFile,
@@ -55,7 +55,7 @@ void main() {
       'image_path': 'assets/images/icon-710x599.png',
       'image_path_android': 'assets/images/icon-android.png',
       'android': 'New Icon',
-      'ios': true
+      'ios': true,
     };
     expect(
       Config.fromJson(flutterIconsNewIconConfig).getImagePathAndroid(),
diff --git a/test/main_test.dart b/test/main_test.dart
index 581cf8a565..17bb7a041b 100644
--- a/test/main_test.dart
+++ b/test/main_test.dart
@@ -111,7 +111,7 @@ flutter_launcher_icons:
     final Map<String, dynamic> flutterIconsConfig = <String, dynamic>{
       'image_path': 'assets/images/icon-710x599.png',
       'android': true,
-      'ios': true
+      'ios': true,
     };
     final config = Config.fromJson(flutterIconsConfig);
     expect(
@@ -122,7 +122,7 @@ flutter_launcher_icons:
     final Map<String, dynamic> flutterIconsConfigAndroid = <String, dynamic>{
       'image_path_android': 'assets/images/icon-710x599.png',
       'android': true,
-      'ios': true
+      'ios': true,
     };
     final configAndroid = Config.fromJson(flutterIconsConfigAndroid);
     expect(
@@ -134,7 +134,7 @@ flutter_launcher_icons:
       'image_path_android': 'assets/images/icon-android.png',
       'image_path_ios': 'assets/images/icon-ios.png',
       'android': true,
-      'ios': true
+      'ios': true,
     };
     final configBoth = Config.fromJson(flutterIconsConfigBoth);
     expect(
@@ -148,7 +148,7 @@ flutter_launcher_icons:
     final Map<String, dynamic> flutterIconsConfig = <String, dynamic>{
       'image_path': 'assets/images/icon-710x599.png',
       'android': true,
-      'ios': true
+      'ios': true,
     };
     final config = Config.fromJson(flutterIconsConfig);
     expect(config.hasPlatformConfig, isTrue);
@@ -156,7 +156,7 @@ flutter_launcher_icons:
 
   test('No platform specified in config', () {
     final Map<String, dynamic> flutterIconsConfig = <String, dynamic>{
-      'image_path': 'assets/images/icon-710x599.png'
+      'image_path': 'assets/images/icon-710x599.png',
     };
     final config = Config.fromJson(flutterIconsConfig);
     expect(config.hasPlatformConfig, isFalse);
@@ -166,7 +166,7 @@ flutter_launcher_icons:
     final Map<String, dynamic> flutterIconsConfig = <String, dynamic>{
       'image_path': 'assets/images/icon-710x599.png',
       'android': false,
-      'ios': true
+      'ios': true,
     };
     final config = Config.fromJson(flutterIconsConfig);
     expect(config.isNeedingNewAndroidIcon, isFalse);
@@ -175,7 +175,7 @@ flutter_launcher_icons:
   test('No new Android icon needed - no Android config', () {
     final Map<String, dynamic> flutterIconsConfig = <String, dynamic>{
       'image_path': 'assets/images/icon-710x599.png',
-      'ios': true
+      'ios': true,
     };
     final config = Config.fromJson(flutterIconsConfig);
     expect(config.isNeedingNewAndroidIcon, isFalse);
@@ -185,7 +185,7 @@ flutter_launcher_icons:
     final Map<String, dynamic> flutterIconsConfig = <String, dynamic>{
       'image_path': 'assets/images/icon-710x599.png',
       'android': true,
-      'ios': false
+      'ios': false,
     };
     final config = Config.fromJson(flutterIconsConfig);
     expect(config.isNeedingNewIOSIcon, isFalse);
@@ -194,7 +194,7 @@ flutter_launcher_icons:
   test('No new iOS icon needed - no iOS config', () {
     final Map<String, dynamic> flutterIconsConfig = <String, dynamic>{
       'image_path': 'assets/images/icon-710x599.png',
-      'android': true
+      'android': true,
     };
     final config = Config.fromJson(flutterIconsConfig);
     expect(config.isNeedingNewIOSIcon, isFalse);
diff --git a/test/web/web_icon_generator_test.dart b/test/web/web_icon_generator_test.dart
index 6872ffa6a0..453492e48d 100644
--- a/test/web/web_icon_generator_test.dart
+++ b/test/web/web_icon_generator_test.dart
@@ -65,7 +65,7 @@ void main() {
             d.file('manifest.json', anything),
           ]),
           d.file('flutter_launcher_icons.yaml', anything),
-          d.file('pubspec.yaml', templates.pubspecTemplate)
+          d.file('pubspec.yaml', templates.pubspecTemplate),
         ]).validate(),
         completes,
       );
diff --git a/test/web/web_template_test.dart b/test/web/web_template_test.dart
index 452c033923..58317b92ca 100644
--- a/test/web/web_template_test.dart
+++ b/test/web/web_template_test.dart
@@ -22,7 +22,7 @@ void main() {
         equals({
           'src': 'icons/Icon-512.png',
           'sizes': '512x512',
-          'type': 'image/png'
+          'type': 'image/png',
         }),
       );
       expect(
@@ -31,7 +31,7 @@ void main() {
           'src': 'icons/Icon-maskable-512.png',
           'sizes': '512x512',
           'type': 'image/png',
-          'purpose': 'maskable'
+          'purpose': 'maskable',
         }),
       );
     });