From 60efdc228411b6ba5458ec5107be68998a7d8c1b Mon Sep 17 00:00:00 2001
From: Parker Lougheed <parlough@gmail.com>
Date: Thu, 15 Jun 2023 20:33:17 -0500
Subject: [PATCH] Migrate away from deprecated strong-mode analysis options

---
 analysis_options.yaml                                     | 7 ++++---
 .../lib/src/rx_ext/serial_disposable.dart                 | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index fa444051..b4610c6c 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,9 +1,10 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
+  language:
+    # strict-casts: true -- DISABLED: Enabled in Dart 2.17
+    strict-inference: true
+    strict-raw-types: true
   exclude:
     - "bin/cache/**"
     - "**/*.freezed.dart"
diff --git a/packages/flutter_reactive_ble/lib/src/rx_ext/serial_disposable.dart b/packages/flutter_reactive_ble/lib/src/rx_ext/serial_disposable.dart
index 18e3b862..39381eb8 100644
--- a/packages/flutter_reactive_ble/lib/src/rx_ext/serial_disposable.dart
+++ b/packages/flutter_reactive_ble/lib/src/rx_ext/serial_disposable.dart
@@ -40,11 +40,11 @@ class _SerialAlreadyDisposed extends Error {
   String toString() => "An instance of $_type has already been disposed";
 }
 
-/// A [SerialDisposable] that constains an underlying stream subscription.
-class StreamSubscriptionSerialDisposable
-    extends SerialDisposable<StreamSubscription> {
+/// A [SerialDisposable] that contains an underlying stream subscription.
+class StreamSubscriptionSerialDisposable<T>
+    extends SerialDisposable<StreamSubscription<T>> {
   StreamSubscriptionSerialDisposable()
-      : super((StreamSubscription subscription) async {
+      : super((StreamSubscription<T> subscription) async {
           await subscription.cancel();
           return const Unit();
         });