diff --git a/analysis_options.yaml b/analysis_options.yaml
index 48e108ab64..60e7bc23f4 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -4,6 +4,7 @@
 #
 # include: ../../analysis_options.yaml
 #
+
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
diff --git a/packages/battery_plus/battery_plus/example/integration_test/battery_plus_test.dart b/packages/battery_plus/battery_plus/example/integration_test/battery_plus_test.dart
index c8af1062e8..d153e0aa86 100644
--- a/packages/battery_plus/battery_plus/example/integration_test/battery_plus_test.dart
+++ b/packages/battery_plus/battery_plus/example/integration_test/battery_plus_test.dart
@@ -7,7 +7,6 @@
 import 'dart:io';
 
 import 'package:battery_plus/battery_plus.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
diff --git a/packages/connectivity_plus/connectivity_plus/example/integration_test/connectivity_plus_test.dart b/packages/connectivity_plus/connectivity_plus/example/integration_test/connectivity_plus_test.dart
index a8f1dbfffb..3080140d74 100644
--- a/packages/connectivity_plus/connectivity_plus/example/integration_test/connectivity_plus_test.dart
+++ b/packages/connectivity_plus/connectivity_plus/example/integration_test/connectivity_plus_test.dart
@@ -5,16 +5,16 @@
 // found in the LICENSE file.
 
 import 'dart:io';
-import 'package:integration_test/integration_test.dart';
-import 'package:flutter_test/flutter_test.dart';
+
 import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
 
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   group('Connectivity test driver', () {
     Connectivity _connectivity;
-    ConnectivityResult _connectionStatusExpected = ConnectivityResult.wifi;
 
     setUpAll(() async {
       _connectivity = Connectivity();
diff --git a/packages/connectivity_plus/connectivity_plus_web/lib/src/network_information_api_connectivity_plugin.dart b/packages/connectivity_plus/connectivity_plus_web/lib/src/network_information_api_connectivity_plugin.dart
index 08fb1e2f79..98064ae05b 100644
--- a/packages/connectivity_plus/connectivity_plus_web/lib/src/network_information_api_connectivity_plugin.dart
+++ b/packages/connectivity_plus/connectivity_plus_web/lib/src/network_information_api_connectivity_plugin.dart
@@ -69,18 +69,18 @@ class NetworkInformationApiConnectivityPlugin extends ConnectivityPlusPlugin {
 
   /// periodically checks the current network state
   Stream<ConnectivityResult> _webPseudoStream() {
-    final StreamController<ConnectivityResult> _webStream =
+    final StreamController<ConnectivityResult> webStream =
         StreamController.broadcast();
     Timer.periodic(
       const Duration(milliseconds: 250),
       (timer) async {
         final result = await checkConnectivity();
         if (result != _lastFallbackState) {
-          _webStream.add(result);
+          webStream.add(result);
         }
       },
     );
-    return _webStream.stream;
+    return webStream.stream;
   }
 }
 
diff --git a/packages/device_info_plus/device_info_plus_platform_interface/lib/device_info_plus_platform_interface.dart b/packages/device_info_plus/device_info_plus_platform_interface/lib/device_info_plus_platform_interface.dart
index 335939a10f..e8808a7f53 100644
--- a/packages/device_info_plus/device_info_plus_platform_interface/lib/device_info_plus_platform_interface.dart
+++ b/packages/device_info_plus/device_info_plus_platform_interface/lib/device_info_plus_platform_interface.dart
@@ -8,11 +8,9 @@ import 'package:device_info_plus_platform_interface/model/macos_device_info.dart
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
 import 'method_channel/method_channel_device_info.dart';
-
 import 'model/android_device_info.dart';
 import 'model/ios_device_info.dart';
 import 'model/linux_device_info.dart';
-import 'model/macos_device_info.dart';
 import 'model/web_browser_info.dart';
 import 'model/windows_device_info.dart';
 
diff --git a/packages/package_info_plus/package_info_plus/example/lib/main.dart b/packages/package_info_plus/package_info_plus/example/lib/main.dart
index 803a45b501..e63b225978 100644
--- a/packages/package_info_plus/package_info_plus/example/lib/main.dart
+++ b/packages/package_info_plus/package_info_plus/example/lib/main.dart
@@ -32,7 +32,7 @@ class MyHomePage extends StatefulWidget {
   final String? title;
 
   @override
-  _MyHomePageState createState() => _MyHomePageState();
+  State<MyHomePage> createState() => _MyHomePageState();
 }
 
 class _MyHomePageState extends State<MyHomePage> {
diff --git a/packages/package_info_plus/package_info_plus/example/pubspec.yaml b/packages/package_info_plus/package_info_plus/example/pubspec.yaml
index d6fa01dab1..046cd8e7b2 100644
--- a/packages/package_info_plus/package_info_plus/example/pubspec.yaml
+++ b/packages/package_info_plus/package_info_plus/example/pubspec.yaml
@@ -30,6 +30,8 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   flutter_lints: ^2.0.1
+  flutter_test:
+    sdk: flutter
 
 flutter:
   uses-material-design: true
diff --git a/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart b/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart
index da60f2b518..256807f91a 100644
--- a/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart
+++ b/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart
@@ -59,8 +59,8 @@ class _FileVersionInfo {
     ];
 
     String? value;
-    final Pointer<IntPtr>? lplpBuffer = calloc<IntPtr>();
-    final Pointer<Uint32>? puLen = calloc<Uint32>();
+    final Pointer<IntPtr> lplpBuffer = calloc<IntPtr>();
+    final Pointer<Uint32> puLen = calloc<Uint32>();
 
     String toHex4(int val) => val.toRadixString(16).padLeft(4, '0');
 
@@ -69,7 +69,7 @@ class _FileVersionInfo {
       final codepage = toHex4(langCodepage[1]!);
       final lpSubBlock = TEXT('\\StringFileInfo\\$lang$codepage\\$name');
       final res =
-          VerQueryValue(_data.lpBlock!, lpSubBlock, lplpBuffer!.cast(), puLen!);
+          VerQueryValue(_data.lpBlock!, lpSubBlock, lplpBuffer.cast(), puLen);
       calloc.free(lpSubBlock);
 
       if (res != 0 && lplpBuffer.value != 0 && puLen.value > 0) {
@@ -79,8 +79,8 @@ class _FileVersionInfo {
       }
     }
 
-    calloc.free(lplpBuffer!);
-    calloc.free(puLen!);
+    calloc.free(lplpBuffer);
+    calloc.free(puLen);
     return value;
   }
 
diff --git a/packages/sensors_plus/sensors_plus/test/sensors_test.dart b/packages/sensors_plus/sensors_plus/test/sensors_test.dart
index 0024e59566..0dea6a11c5 100644
--- a/packages/sensors_plus/sensors_plus/test/sensors_test.dart
+++ b/packages/sensors_plus/sensors_plus/test/sensors_test.dart
@@ -63,7 +63,7 @@ void main() {
 void _initializeFakeSensorChannel(String channelName, List<double> sensorData) {
   const standardMethod = StandardMethodCodec();
 
-  void _emitEvent(ByteData? event) {
+  void emitEvent(ByteData? event) {
     ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage(
       channelName,
       event,
@@ -75,8 +75,8 @@ void _initializeFakeSensorChannel(String channelName, List<double> sensorData) {
       .setMockMessageHandler(channelName, (ByteData? message) async {
     final methodCall = standardMethod.decodeMethodCall(message);
     if (methodCall.method == 'listen') {
-      _emitEvent(standardMethod.encodeSuccessEnvelope(sensorData));
-      _emitEvent(null);
+      emitEvent(standardMethod.encodeSuccessEnvelope(sensorData));
+      emitEvent(null);
       return standardMethod.encodeSuccessEnvelope(null);
     } else if (methodCall.method == 'cancel') {
       return standardMethod.encodeSuccessEnvelope(null);
diff --git a/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart b/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart
index 09b2ad714b..88c3fb770e 100644
--- a/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart
+++ b/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart
@@ -86,7 +86,7 @@ void main() {
 void _initializeFakeSensorChannel(String channelName, List<double> sensorData) {
   const standardMethod = StandardMethodCodec();
 
-  void _emitEvent(ByteData? event) {
+  void emitEvent(ByteData? event) {
     ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage(
       channelName,
       event,
@@ -98,8 +98,8 @@ void _initializeFakeSensorChannel(String channelName, List<double> sensorData) {
       .setMockMessageHandler(channelName, (ByteData? message) async {
     final methodCall = standardMethod.decodeMethodCall(message);
     if (methodCall.method == 'listen') {
-      _emitEvent(standardMethod.encodeSuccessEnvelope(sensorData));
-      _emitEvent(null);
+      emitEvent(standardMethod.encodeSuccessEnvelope(sensorData));
+      emitEvent(null);
       return standardMethod.encodeSuccessEnvelope(null);
     } else if (methodCall.method == 'cancel') {
       return standardMethod.encodeSuccessEnvelope(null);
diff --git a/packages/share_plus/share_plus_platform_interface/lib/method_channel/method_channel_share.dart b/packages/share_plus/share_plus_platform_interface/lib/method_channel/method_channel_share.dart
index 131564762f..61ede5d99f 100644
--- a/packages/share_plus/share_plus_platform_interface/lib/method_channel/method_channel_share.dart
+++ b/packages/share_plus/share_plus_platform_interface/lib/method_channel/method_channel_share.dart
@@ -3,12 +3,10 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:ui';
 
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart' show visibleForTesting;
 import 'package:mime/mime.dart' show lookupMimeType;
-
 import 'package:share_plus_platform_interface/share_plus_platform_interface.dart';
 
 /// Plugin for summoning a platform share sheet.
diff --git a/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart b/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart
index 832a4933fa..6265bfa72f 100644
--- a/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart
+++ b/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart
@@ -3,17 +3,15 @@
 // found in the LICENSE file.
 
 import 'dart:io';
-import 'dart:ui';
 
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart'
     show TestDefaultBinaryMessengerBinding, TestWidgetsFlutterBinding;
 import 'package:mockito/mockito.dart';
-import 'package:share_plus_platform_interface/share_plus_platform_interface.dart';
 import 'package:share_plus_platform_interface/method_channel/method_channel_share.dart';
+import 'package:share_plus_platform_interface/share_plus_platform_interface.dart';
 import 'package:test/test.dart';
 
-import 'package:flutter/services.dart';
-
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();