Merge branch 'master' into dependabot/gradle/android/androidx.camera-camera-camera2-1.2.3

@@ -37,4 +37,4 @@ jobs:
         with:
           cache: true
       - name: Format
-        run: dart format -n --set-exit-if-changed .
+        run: dart format --set-exit-if-changed .

-include: package:lint/analysis_options_package.yaml
\ No newline at end of file
+include: package:lint/analysis_options_package.yaml
+
+linter:
+  rules:
+    - combinators_ordering
+    - require_trailing_commas
+    - unnecessary_library_directive
\ No newline at end of file

-library mobile_scanner;
-
 export 'src/enums/camera_facing.dart';
 export 'src/enums/detection_speed.dart';
 export 'src/enums/mobile_scanner_error_code.dart';

-library mobile_scanner_web;
-
 export 'src/web/base.dart';
 export 'src/web/jsqr.dart';
 export 'src/web/zxing.dart';

@@ -18,8 +18,10 @@ class MobileScannerController {
     this.torchEnabled = false,
     this.formats,
     this.returnImage = false,
-    @Deprecated('Instead, use the result of calling `start()` to determine if permissions were granted.')
-        this.onPermissionSet,
+    @Deprecated(
+      'Instead, use the result of calling `start()` to determine if permissions were granted.',
+    )
+    this.onPermissionSet,
     this.autoStart = true,
   });
 

 import 'dart:async';
 import 'dart:html' as html;
-import 'dart:js' show context, JsObject;
+import 'dart:js' show JsObject, context;
 
 import 'package:mobile_scanner/src/web/base.dart';
 

@@ -7,12 +7,20 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   setUp(() {
-    channel.setMockMethodCallHandler((MethodCall methodCall) async {
-      return '42';
-    });
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(
+      channel,
+      (MethodCall methodCall) async {
+        return '42';
+      },
+    );
   });
 
   tearDown(() {
-    channel.setMockMethodCallHandler(null);
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(
+      channel,
+      null,
+    );
   });
 }