Skip to content

Commit 40d5631

Browse files
dustin-grahampauldemarco
authored andcommitted
upgrade to RxDart 0.23 (pauldemarco#468)
remove unused, invalid plugin test
1 parent 00f57b5 commit 40d5631

File tree

4 files changed

+5
-30
lines changed

4 files changed

+5
-30
lines changed

lib/src/bluetooth_characteristic.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class BluetoothCharacteristic {
2222
}
2323

2424
BehaviorSubject<List<int>> _value;
25-
Stream<List<int>> get value => Observable.merge([
25+
Stream<List<int>> get value => Rx.merge([
2626
_value.stream,
2727
_onValueChangedStream,
2828
]);

lib/src/flutter_blue.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class FlutterBlue {
8787
final killStreams = <Stream>[];
8888
killStreams.add(_stopScanPill);
8989
if (timeout != null) {
90-
killStreams.add(Observable.timer(null, timeout));
90+
killStreams.add(Rx.timer(null, timeout));
9191
}
9292

9393
// Clear scan results list
@@ -102,10 +102,8 @@ class FlutterBlue {
102102
throw e;
103103
}
104104

105-
yield* Observable(FlutterBlue.instance._methodStream
106-
.where((m) => m.method == "ScanResult")
107-
.map((m) => m.arguments))
108-
.takeUntil(Observable.merge(killStreams))
105+
yield* FlutterBlue.instance._methodStream.where((m) => m.method == "ScanResult").map((m) => m.arguments)
106+
.takeUntil(Rx.merge(killStreams))
109107
.doOnDone(stopScan)
110108
.map((buffer) => new protos.ScanResult.fromBuffer(buffer))
111109
.map((p) {

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
sdk: flutter
1515
convert: "^2.1.1"
1616
protobuf: "^1.0.0"
17-
rxdart: "^0.22.0"
17+
rxdart: ^0.23.1
1818

1919
dev_dependencies:
2020
flutter_test:

test/flutter_blue_test.dart

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)