Use strict analysis mode

amake · Sep 21, 2023 · 0ae172b · 0ae172b
1 parent 62cd449
commit 0ae172b
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 23 deletions.
diff --git a/flutter_charset_detector/analysis_options.yaml b/flutter_charset_detector/analysis_options.yaml
@@ -1,6 +1,7 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
+  language:
+    strict-casts: true
+    strict-inference: true
+    strict-raw-types: true
diff --git a/flutter_charset_detector/test/flutter_charset_detector_test.dart b/flutter_charset_detector/test/flutter_charset_detector_test.dart
@@ -10,7 +10,8 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   setUp(() {
-    channel.setMockMethodCallHandler((methodCall) async {
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, (methodCall) async {
       switch (methodCall.method) {
         case 'autoDecode':
           final args = methodCall.arguments as Map;
@@ -25,7 +26,8 @@ void main() {
   });
 
   tearDown(() {
-    channel.setMockMethodCallHandler(null);
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, null);
   });
 
   test('testAutoDecode', () async {

diff --git a/flutter_charset_detector_android/analysis_options.yaml b/flutter_charset_detector_android/analysis_options.yaml
@@ -1,6 +1,7 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
+  language:
+    strict-casts: true
+    strict-inference: true
+    strict-raw-types: true
diff --git a/flutter_charset_detector_android/lib/flutter_charset_detector_android.dart b/flutter_charset_detector_android/lib/flutter_charset_detector_android.dart
@@ -14,8 +14,8 @@ class CharsetDetectorAndroid extends CharsetDetectorPlatform {
   /// Automatically detect the charset of [bytes] and decode to a string.
   @override
   Future<DecodingResult> autoDecode(Uint8List bytes) async {
-    final result =
-        await _channel.invokeMethod<Map>('autoDecode', {'data': bytes}) as Map;
-    return DecodingResult.fromJson(result.cast<String, dynamic>());
+    final result = await _channel
+        .invokeMethod<Map<String, dynamic>>('autoDecode', {'data': bytes});
+    return DecodingResult.fromJson(result!);
   }
 }
diff --git a/flutter_charset_detector_ios/analysis_options.yaml b/flutter_charset_detector_ios/analysis_options.yaml
@@ -1,6 +1,7 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
+  language:
+    strict-casts: true
+    strict-inference: true
+    strict-raw-types: true
diff --git a/flutter_charset_detector_ios/lib/flutter_charset_detector_ios.dart b/flutter_charset_detector_ios/lib/flutter_charset_detector_ios.dart
@@ -14,8 +14,8 @@ class CharsetDetectorIOS extends CharsetDetectorPlatform {
   /// Automatically detect the charset of [bytes] and decode to a string.
   @override
   Future<DecodingResult> autoDecode(Uint8List bytes) async {
-    final result =
-        await _channel.invokeMethod<Map>('autoDecode', {'data': bytes}) as Map;
-    return DecodingResult.fromJson(result.cast<String, dynamic>());
+    final result = await _channel
+        .invokeMethod<Map<String, dynamic>>('autoDecode', {'data': bytes});
+    return DecodingResult.fromJson(result!);
   }
 }
diff --git a/flutter_charset_detector_platform_interface/analysis_options.yaml b/flutter_charset_detector_platform_interface/analysis_options.yaml
@@ -1,6 +1,7 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
+  language:
+    strict-casts: true
+    strict-inference: true
+    strict-raw-types: true
diff --git a/flutter_charset_detector_platform_interface/lib/src/method_channel_charset_detector.dart b/flutter_charset_detector_platform_interface/lib/src/method_channel_charset_detector.dart
@@ -11,8 +11,8 @@ class MethodChannelCharsetDetector extends CharsetDetectorPlatform {
   /// Automatically detect the charset of [bytes] and decode to a string.
   @override
   Future<DecodingResult> autoDecode(Uint8List bytes) async {
-    final result =
-        await _channel.invokeMethod<Map>('autoDecode', {'data': bytes}) as Map;
-    return DecodingResult.fromJson(result.cast<String, dynamic>());
+    final result = await _channel
+        .invokeMethod<Map<String, dynamic>>('autoDecode', {'data': bytes});
+    return DecodingResult.fromJson(result!);
   }
 }