Skip to content

Commit b397004

Browse files
Taym95parlough
andauthored
Migrate away from deprecated strong mode analysis options (#832)
* Migrate away from deprecated strong-mode analysis options --------- Co-authored-by: Parker Lougheed <[email protected]>
1 parent 28f99b3 commit b397004

File tree

8 files changed

+32
-15
lines changed

8 files changed

+32
-15
lines changed

analysis_options.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
include: package:flutter_lints/flutter.yaml
22

33
analyzer:
4-
strong-mode:
5-
implicit-casts: false
6-
implicit-dynamic: false
4+
language:
5+
# strict-casts: true -- DISABLED: was introduced in Dart 2.16
6+
strict-inference: true
7+
strict-raw-types: true
78
exclude:
89
- "bin/cache/**"
910
- "**/*.freezed.dart"
@@ -27,8 +28,7 @@ linter:
2728
- empty_statements
2829
- hash_and_equals
2930
- invariant_booleans
30-
- iterable_contains_unrelated_type
31-
- list_remove_unrelated_type
31+
- collection_methods_unrelated_type
3232
- literal_only_boolean_expressions
3333
- no_adjacent_strings_in_list
3434
- no_duplicate_case_values

example/lib/src/ble/ble_device_connector.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:flutter_reactive_ble_example/src/ble/reactive_state.dart';
66
class BleDeviceConnector extends ReactiveState<ConnectionStateUpdate> {
77
BleDeviceConnector({
88
required FlutterReactiveBle ble,
9-
required Function(String message) logMessage,
9+
required void Function(String message) logMessage,
1010
}) : _ble = ble,
1111
_logMessage = logMessage;
1212

example/lib/src/ble/ble_scanner.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:meta/meta.dart';
77
class BleScanner implements ReactiveState<BleScannerState> {
88
BleScanner({
99
required FlutterReactiveBle ble,
10-
required Function(String message) logMessage,
10+
required void Function(String message) logMessage,
1111
}) : _ble = ble,
1212
_logMessage = logMessage;
1313

@@ -59,7 +59,7 @@ class BleScanner implements ReactiveState<BleScannerState> {
5959
await _stateStreamController.close();
6060
}
6161

62-
StreamSubscription? _subscription;
62+
StreamSubscription<DiscoveredDevice>? _subscription;
6363
}
6464

6565
@immutable

example/pubspec.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ packages:
207207
source: sdk
208208
version: "0.0.0"
209209
flutter_lints:
210-
dependency: "direct main"
210+
dependency: "direct dev"
211211
description:
212212
name: flutter_lints
213213
sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
@@ -591,4 +591,4 @@ packages:
591591
version: "3.1.1"
592592
sdks:
593593
dart: ">=3.2.0-194.0.dev <4.0.0"
594-
flutter: ">=1.16.0"
594+
flutter: ">=2.0.0"

example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ publish_to: 'none'
55

66
environment:
77
sdk: '>=2.17.0 <3.0.0'
8-
flutter: ">=1.10.0"
8+
flutter: ">=2.0.0"
99

1010
dependencies:
1111
flutter:
1212
sdk: flutter
13-
flutter_lints: ^1.0.4
1413
flutter_reactive_ble: ^5.2.0
1514
functional_data: ^1.0.0
1615
intl: ^0.17.0
@@ -20,6 +19,7 @@ dependencies:
2019
dev_dependencies:
2120
build_runner: ^2.3.3
2221
dependency_validator: ^3.1.0
22+
flutter_lints: ^1.0.4
2323
flutter_test:
2424
sdk: flutter
2525
functional_data_generator: ^1.1.2

packages/flutter_reactive_ble/lib/src/rx_ext/serial_disposable.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ class _SerialAlreadyDisposed extends Error {
4141
}
4242

4343
/// A [SerialDisposable] that contains an underlying stream subscription.
44-
class StreamSubscriptionSerialDisposable
45-
extends SerialDisposable<StreamSubscription> {
44+
class StreamSubscriptionSerialDisposable<T>
45+
extends SerialDisposable<StreamSubscription<T>> {
4646
StreamSubscriptionSerialDisposable()
47-
: super((StreamSubscription subscription) async {
47+
: super((StreamSubscription<T> subscription) async {
4848
await subscription.cancel();
4949
return const Unit();
5050
});

packages/reactive_ble_mobile/pubspec.lock

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,14 @@ packages:
198198
description: flutter
199199
source: sdk
200200
version: "0.0.0"
201+
flutter_lints:
202+
dependency: "direct dev"
203+
description:
204+
name: flutter_lints
205+
sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
206+
url: "https://pub.dev"
207+
source: hosted
208+
version: "1.0.4"
201209
flutter_test:
202210
dependency: "direct dev"
203211
description: flutter
@@ -275,6 +283,14 @@ packages:
275283
url: "https://pub.dev"
276284
source: hosted
277285
version: "4.8.1"
286+
lints:
287+
dependency: transitive
288+
description:
289+
name: lints
290+
sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
291+
url: "https://pub.dev"
292+
source: hosted
293+
version: "1.0.1"
278294
logging:
279295
dependency: transitive
280296
description:

packages/reactive_ble_mobile/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dependencies:
1515

1616
dev_dependencies:
1717
build_runner: ^2.3.3
18+
flutter_lints: ^1.0.4
1819
flutter_test:
1920
sdk: flutter
2021
mockito: ^5.0.14

0 commit comments

Comments
 (0)