Skip to content

Commit eab113e

Browse files
authored
fix: analyzer when using Dart 2.16.0 (#663)
* fix: analyzer when using Dart 2.16.0 * update rxdart-test.yml
1 parent 4235096 commit eab113e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/rxdart-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ on:
99
paths-ignore: [ '**.md' ]
1010
schedule:
1111
# Runs at 00:00 UTC on the 1, 8, 15, 22 and 29th of every month.
12-
- cron: '0 0 */7 * *'
12+
- cron: '0 0 */7 * *'
1313
jobs:
1414
analyze-and-test:
1515
runs-on: ubuntu-latest
1616

1717
strategy:
1818
matrix:
19-
sdk: [ stable, beta, dev, 2.12.0 ]
19+
sdk: [ beta, stable, 2.15.0, 2.12.0 ]
2020

2121
steps:
2222
- uses: actions/checkout@v2

lib/src/transformers/group_by.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ class _GroupByStreamSink<T, K> extends ForwardingSink<T, GroupedStream<T, K>> {
7272
subscriptions = null;
7373
return future;
7474
}
75+
return null;
7576
}
7677

7778
@override

lib/src/utils/composite_subscription.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ class CompositeSubscription implements StreamSubscription<Never> {
5353
Future<void>? remove(
5454
StreamSubscription<dynamic> subscription, {
5555
bool shouldCancel = true,
56-
}) {
57-
if (_subscriptionsList.remove(subscription) && shouldCancel) {
58-
return subscription.cancel();
59-
}
60-
}
56+
}) =>
57+
_subscriptionsList.remove(subscription) && shouldCancel
58+
? subscription.cancel()
59+
: null;
6160

6261
/// Cancels all subscriptions added to this composite. Clears subscriptions collection.
6362
///

0 commit comments

Comments
 (0)