Unify Analysis Options YAML into a single reference file (see #74)

.gitignore

@@ -45,3 +45,5 @@ build/
 .classpath
 .settings
 /.fvm
+
+.melos_tool/

analysis_options.yaml

@@ -1,4 +1,19 @@
-include: package:pedantic/analysis_options.1.8.0.yaml
+# This is the default analysis_options.yaml for all packages and examples
+# If a package needs specific rules, create the analysis_options.yaml on it
+# include this file, like:
+#
+# include: ../../analysis_options.yaml
+#
+include: package:pedantic/analysis_options.1.9.0.yaml
+
+analyzer:
+  exclude:
+    # Ignore generated files
+    - '**/*.g.dart'
+    - 'lib/src/generated/*.dart'
+
 linter:
   rules:
-    - public_member_api_docs
+    public_member_api_docs: true
+    prefer_final_in_for_each: true
+    prefer_final_locals: true

melos.yaml

@@ -78,8 +78,8 @@ scripts:
       rm -rf ./build ./android/.gradle ./ios/.symlinks ./ios/Pods ./android/.idea ./.idea ./.dart-tool/build
 
 dev_dependencies:
-  pedantic: 1.8.0
+  pedantic: 1.9.2
 
 environment:
   sdk: ">=2.1.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.5 <2.0.0"
+  flutter: ">=1.12.13+hotfix.5 <2.0.0"

packages/android_alarm_manager_plus/example/lib/main.dart

@@ -94,7 +94,7 @@ class _AlarmHomePageState extends State<_AlarmHomePage> {
 
     // Get the previous cached count and increment it.
     final prefs = await SharedPreferences.getInstance();
-    var currentCount = prefs.getInt(countKey);
+    final currentCount = prefs.getInt(countKey);
     await prefs.setInt(countKey, currentCount + 1);
 
     // This will be null if we're running in the background.

packages/android_alarm_manager_plus/example/pubspec.yaml

@@ -1,6 +1,10 @@
 name: android_alarm_manager_example
 description: Demonstrates how to use the android_alarm_manager_plus plugin.
 
+environment:
+  sdk: ">=2.1.0 <3.0.0"
+  flutter: ">=1.12.13+hotfix.5 <2.0.0"
+
 dependencies:
   flutter:
     sdk: flutter
@@ -16,7 +20,7 @@ dev_dependencies:
     sdk: flutter
   flutter_test:
     sdk: flutter
-  pedantic: ^1.8.0
+  pedantic: ^1.9.2
 
 flutter:
   uses-material-design: true

packages/android_alarm_manager_plus/example/test_driver/android_alarm_manager_plus_e2e_test.dart

@@ -12,7 +12,7 @@ Future<StreamSubscription<VMIsolateRef>> resumeIsolatesOnPause(
     FlutterDriver driver) async {
   final vm = await driver.serviceClient.getVM();
   print('for isolates');
-  for (var isolateRef in vm.isolates) {
+  for (final isolateRef in vm.isolates) {
     final isolate = await isolateRef.load();
     if (isolate.isPaused) {
       print('isolate.resume');

packages/android_alarm_manager_plus/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  pedantic: ^1.9.0
+  pedantic: ^1.9.2
 
 flutter:
   plugin:

packages/android_intent_plus/pubspec.yaml

@@ -21,7 +21,7 @@ dev_dependencies:
   mockito: ^3.0.0
   flutter_test:
     sdk: flutter
-  pedantic: ^1.9.0
+  pedantic: ^1.9.2
 
 environment:
   sdk: ">=2.3.0 <3.0.0"

packages/battery_plus/example/lib/main.dart

@@ -36,7 +36,7 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  Battery _battery = Battery();
+  final Battery _battery = Battery();
 
   BatteryState _batteryState;
   StreamSubscription<BatteryState> _batteryStateSubscription;
@@ -64,7 +64,7 @@ class _MyHomePageState extends State<MyHomePage> {
       floatingActionButton: FloatingActionButton(
         child: const Icon(Icons.battery_unknown),
         onPressed: () async {
-          final int batteryLevel = await _battery.batteryLevel;
+          final batteryLevel = await _battery.batteryLevel;
           // ignore: unawaited_futures
           showDialog<void>(
             context: context,

packages/battery_plus/example/pubspec.yaml

@@ -1,6 +1,5 @@
 name: battery_plus_example
 description: Demonstrates how to use the battery_plus plugin.
-version: 1.0.0+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -15,7 +14,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test: ^0.9.1
-  pedantic: ^1.9.0
+  pedantic: ^1.9.2
 
 flutter:
   uses-material-design: true

packages/battery_plus/example/test_driver/battery_plus_e2e.dart

@@ -10,8 +10,8 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   testWidgets('Can get battery level', (WidgetTester tester) async {
-    final Battery battery = Battery();
-    final int batteryLevel = await battery.batteryLevel;
+    final battery = Battery();
+    final batteryLevel = await battery.batteryLevel;
     expect(batteryLevel, isNotNull);
   });
 }

packages/battery_plus/example/test_driver/battery_plus_e2e_test.dart

@@ -7,8 +7,8 @@ import 'dart:io';
 import 'package:flutter_driver/flutter_driver.dart';
 
 Future<void> main() async {
-  final FlutterDriver driver = await FlutterDriver.connect();
-  final String data =
+  final driver = await FlutterDriver.connect();
+  final data =
       await driver.requestData(null, timeout: const Duration(minutes: 1));
   await driver.close();
   final Map<String, dynamic> result = jsonDecode(data);

packages/battery_plus/lib/battery_plus.dart

@@ -23,9 +23,7 @@ class Battery {
   // EventChannel because it is overridden. Forcing the class to be a singleton class can prevent
   // misuse of creating a second instance from a programmer.
   factory Battery() {
-    if (_singleton == null) {
-      _singleton = Battery._();
-    }
+    _singleton ??= Battery._();
     return _singleton;
   }
 

packages/battery_plus/pubspec.yaml

@@ -39,7 +39,7 @@ dev_dependencies:
     sdk: flutter
   integration_test: ^0.9.1
   plugin_platform_interface: ^1.0.0
-  pedantic: ^1.9.0
+  pedantic: ^1.9.2
 
 environment:
   sdk: '>=2.1.0 <3.0.0'

packages/battery_plus/test/battery_test.dart

@@ -45,8 +45,7 @@ void main() {
     });
 
     test('receive values', () async {
-      final StreamQueue<BatteryState> queue =
-          StreamQueue<BatteryState>(battery.onBatteryStateChanged);
+      final queue = StreamQueue<BatteryState>(battery.onBatteryStateChanged);
 
       controller.add(BatteryState.full);
       expect(await queue.next, BatteryState.full);

packages/battery_plus_linux/lib/src/battery_plus_linux_real.dart

@@ -20,6 +20,7 @@ extension _ToBatteryState on UPowerBatteryState {
   }
 }
 
+///
 @visibleForTesting
 typedef UPowerDeviceFactory = UPowerDevice Function();
 
@@ -49,6 +50,7 @@ class BatteryPlusLinux extends BatteryPlatform {
   StreamController<BatteryState> _stateController;
 
   @visibleForTesting
+  // ignore: public_member_api_docs
   UPowerDeviceFactory createDevice = () => UPowerDevice.display();
 
   void _addState(UPowerBatteryState value) {

packages/battery_plus_linux/lib/src/upower_device.dart

@@ -4,6 +4,9 @@ const _kInterface = 'org.freedesktop.UPower';
 const _kDeviceAddress = 'org.freedesktop.UPower.Device';
 const _kDisplayDevicePath = '/org/freedesktop/UPower/devices/DisplayDevice';
 
+// Used internally
+// ignore_for_file: public_member_api_docs
+
 enum UPowerBatteryState {
   unknown,
   charging,

packages/battery_plus_platform_interface/lib/src/method_channel_battery_plus.dart

@@ -26,17 +26,17 @@ class MethodChannelBattery extends BatteryPlatform {
   Stream<BatteryState> _onBatteryStateChanged;
 
   /// Returns the current battery level in percent.
+  @override
   Future<int> get batteryLevel => methodChannel
       .invokeMethod<int>('getBatteryLevel')
       .then<int>((dynamic result) => result);
 
   /// Fires whenever the battery state changes.
+  @override
   Stream<BatteryState> get onBatteryStateChanged {
-    if (_onBatteryStateChanged == null) {
-      _onBatteryStateChanged = eventChannel
-          .receiveBroadcastStream()
-          .map((dynamic event) => parseBatteryState(event));
-    }
+    _onBatteryStateChanged ??= eventChannel
+        .receiveBroadcastStream()
+        .map((dynamic event) => parseBatteryState(event));
     return _onBatteryStateChanged;
   }
 }

packages/battery_plus_platform_interface/pubspec.yaml

@@ -17,4 +17,4 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  pedantic: ^1.9.0
+  pedantic: ^1.9.2

packages/battery_plus_platform_interface/test/battery_plus_platform_interface_test.dart

@@ -7,7 +7,7 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   group('$MethodChannelBattery', () {
-    final List<MethodCall> log = <MethodCall>[];
+    final log = <MethodCall>[];
     MethodChannelBattery methodChannelBattery;
 
     setUp(() async {
@@ -44,13 +44,12 @@ void main() {
     });
 
     test('onBatteryChanged', () async {
-      final BatteryState result =
-          await methodChannelBattery.onBatteryStateChanged.first;
+      final result = await methodChannelBattery.onBatteryStateChanged.first;
       expect(result, BatteryState.full);
     });
 
     test('getBatteryLevel', () async {
-      final int result = await methodChannelBattery.batteryLevel;
+      final result = await methodChannelBattery.batteryLevel;
       expect(result, 100);
       expect(
         log,

packages/battery_plus_web/pubspec.yaml

@@ -26,6 +26,7 @@ dev_dependencies:
     sdk: flutter
   integration_test: ^0.9.1
   mockito: ^4.1.2
+  pedantic: ^1.9.2
 
 environment:
   sdk: '>=2.6.0 <3.0.0'

packages/connectivity_plus/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.1
+
+- Bump linux version.
+
 ## 0.7.0
 
 - Add Linux support (`connectivity_plus_linux`).

packages/connectivity_plus/example/lib/main.dart

@@ -104,8 +104,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
         try {
           if (!kIsWeb && Platform.isIOS) {
-            LocationAuthorizationStatus status =
-                await _connectivity.getLocationServiceAuthorization();
+            var status = await _connectivity.getLocationServiceAuthorization();
             if (status == LocationAuthorizationStatus.notDetermined) {
               status =
                   await _connectivity.requestLocationServiceAuthorization();
@@ -121,13 +120,12 @@ class _MyHomePageState extends State<MyHomePage> {
           }
         } on PlatformException catch (e) {
           print(e.toString());
-          wifiName = "Failed to get Wifi Name";
+          wifiName = 'Failed to get Wifi Name';
         }
 
         try {
           if (!kIsWeb && Platform.isIOS) {
-            LocationAuthorizationStatus status =
-                await _connectivity.getLocationServiceAuthorization();
+            var status = await _connectivity.getLocationServiceAuthorization();
             if (status == LocationAuthorizationStatus.notDetermined) {
               status =
                   await _connectivity.requestLocationServiceAuthorization();
@@ -143,14 +141,14 @@ class _MyHomePageState extends State<MyHomePage> {
           }
         } on PlatformException catch (e) {
           print(e.toString());
-          wifiBSSID = "Failed to get Wifi BSSID";
+          wifiBSSID = 'Failed to get Wifi BSSID';
         }
 
         try {
           wifiIP = await _connectivity.getWifiIP();
         } on PlatformException catch (e) {
           print(e.toString());
-          wifiIP = "Failed to get Wifi IP";
+          wifiIP = 'Failed to get Wifi IP';
         }
 
         setState(() {

packages/connectivity_plus/example/pubspec.yaml

@@ -1,6 +1,9 @@
 name: connectivity_plus_example
 description: Demonstrates how to use the connectivity_plus plugin.
 
+environment:
+  sdk: ">=2.7.0 <3.0.0"
+
 dependencies:
   flutter:
     sdk: flutter
@@ -12,7 +15,7 @@ dev_dependencies:
     sdk: flutter
   test: any
   integration_test: ^0.9.1
-  pedantic: ^1.8.0
+  pedantic: ^1.9.2
 
 flutter:
   uses-material-design: true

packages/connectivity_plus/example/test_driver/connectivity_plus_e2e.dart

@@ -18,7 +18,7 @@ void main() {
     });
 
     testWidgets('test connectivity result', (WidgetTester tester) async {
-      final ConnectivityResult result = await _connectivity.checkConnectivity();
+      final result = await _connectivity.checkConnectivity();
       expect(result, isNotNull);
       switch (result) {
         case ConnectivityResult.wifi:

packages/connectivity_plus/example/test_driver/connectivity_plus_e2e_test.dart

@@ -7,8 +7,8 @@ import 'dart:io';
 import 'package:flutter_driver/flutter_driver.dart';
 
 Future<void> main() async {
-  final FlutterDriver driver = await FlutterDriver.connect();
-  final String data =
+  final driver = await FlutterDriver.connect();
+  final data =
       await driver.requestData(null, timeout: const Duration(minutes: 1));
   await driver.close();
   final Map<String, dynamic> result = jsonDecode(data);

packages/connectivity_plus/lib/connectivity_plus.dart

@@ -24,9 +24,7 @@ class Connectivity {
   // EventChannel because it is overridden. Forcing the class to be a singleton class can prevent
   // misuse of creating a second instance from a programmer.
   factory Connectivity() {
-    if (_singleton == null) {
-      _singleton = Connectivity._();
-    }
+    _singleton ??= Connectivity._();
     return _singleton;
   }