diff --git a/CHANGELOG.md b/CHANGELOG.md index c426951..140448a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.2.0 - May 10, 2021 + +* Update `rxdart` to `0.27.0`. + ## 1.1.0 - Mar 27, 2021 * Stable release for null safety. diff --git a/example/pubspec.lock b/example/pubspec.lock index cea4f1e..c39cbd1 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -189,7 +189,7 @@ packages: name: distinct_value_connectable_stream url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" fake_async: dependency: transitive description: @@ -381,14 +381,14 @@ packages: name: rxdart url: "https://pub.dartlang.org" source: hosted - version: "0.26.0" + version: "0.27.0" rxdart_ext: dependency: transitive description: name: rxdart_ext url: "https://pub.dartlang.org" source: hosted - version: "0.0.1" + version: "0.1.0" shelf: dependency: transitive description: @@ -442,7 +442,7 @@ packages: path: ".." relative: true source: path - version: "1.1.0" + version: "1.2.0" stream_transform: dependency: transitive description: diff --git a/lib/src/loader_bloc.dart b/lib/src/loader_bloc.dart index c65291b..bcedaa7 100644 --- a/lib/src/loader_bloc.dart +++ b/lib/src/loader_bloc.dart @@ -80,9 +80,9 @@ class LoaderBloc { .map>( (content) => LoaderPartialStateChange.fetchSuccess(content)) .startWith(const LoaderPartialStateChange.fetchLoading()) - .doOnError((e, s) => messageS - .add(LoaderMessage.fetchFailure(e, s ?? StackTrace.current))) - .onErrorReturnWith((e) => LoaderPartialStateChange.fetchFailure(e)), + .doOnError((e, s) => messageS.add(LoaderMessage.fetchFailure(e, s))) + .onErrorReturnWith( + (e, _) => LoaderPartialStateChange.fetchFailure(e)), ); final refreshChanges = refreshS.stream.exhaustMap( (completer) => Rx.defer(refresherFunction!) @@ -90,8 +90,7 @@ class LoaderBloc { (content) => messageS.add(LoaderMessage.refreshSuccess(content))) .map>( (content) => LoaderPartialStateChange.refreshSuccess(content)) - .doOnError((e, s) => messageS - .add(LoaderMessage.refreshFailure(e, s ?? StackTrace.current))) + .doOnError((e, s) => messageS.add(LoaderMessage.refreshFailure(e, s))) .onErrorResumeNext(Stream.empty()) .doOnDone(() => completer.complete()), ); @@ -136,11 +135,10 @@ class LoaderBloc { /// Return new [LoaderState] from old [state] and partial state [change] @visibleForTesting static LoaderState reduce( - LoaderState? acc, + LoaderState state, LoaderPartialStateChange change, int _, ) { - final state = acc!; return change.fold( onRefreshSuccess: (content) => state.rebuild((b) => b ..content = content diff --git a/lib/src/loader_widget.dart b/lib/src/loader_widget.dart index ae0e7a0..c09fba1 100644 --- a/lib/src/loader_widget.dart +++ b/lib/src/loader_widget.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:rxdart_ext/rxdart_ext.dart' show ValueStreamExtensions; import 'loader_bloc.dart'; import 'loader_message.dart'; @@ -116,7 +115,7 @@ class _LoaderWidgetState return StreamBuilder>( stream: bloc.state$, - initialData: bloc.state$.requireValue, + initialData: bloc.state$.value, builder: (context, snapshot) { return widget.builder( context, diff --git a/pubspec.lock b/pubspec.lock index 9b0ac6b..39df441 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,21 +7,21 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "19.0.0" + version: "21.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.5.0" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.6.0" + version: "2.1.0" async: dependency: transitive description: @@ -49,49 +49,49 @@ packages: name: build_config url: "https://pub.dartlang.org" source: hosted - version: "0.4.7" + version: "1.0.0" build_daemon: dependency: transitive description: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "2.1.10" + version: "3.0.0" build_resolvers: dependency: transitive description: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.1" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "1.12.2" + version: "2.0.2" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "6.1.12" + version: "7.0.0" built_collection: dependency: transitive description: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "4.3.2" + version: "5.0.0" built_value: dependency: transitive description: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "7.1.0" + version: "8.0.6" characters: dependency: transitive description: @@ -133,7 +133,7 @@ packages: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "3.7.0" + version: "4.0.0" collection: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: distinct_value_connectable_stream url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" fake_async: dependency: transitive description: @@ -196,7 +196,7 @@ packages: name: fixnum url: "https://pub.dartlang.org" source: hosted - version: "0.10.11" + version: "1.0.0" flutter: dependency: "direct main" description: flutter @@ -207,6 +207,13 @@ packages: description: flutter source: sdk version: "0.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" glob: dependency: transitive description: @@ -220,35 +227,35 @@ packages: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "2.0.0" http_multi_server: dependency: transitive description: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "3.0.1" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "3.1.4" + version: "4.0.0" io: dependency: transitive description: name: io url: "https://pub.dartlang.org" source: hosted - version: "0.3.4" + version: "1.0.0" js: dependency: transitive description: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.2" + version: "0.6.3" json_annotation: dependency: transitive description: @@ -283,14 +290,14 @@ packages: name: mime url: "https://pub.dartlang.org" source: hosted - version: "0.9.7" + version: "1.0.0" mockito: dependency: "direct dev" description: name: mockito url: "https://pub.dartlang.org" source: hosted - version: "5.0.3" + version: "5.0.7" package_config: dependency: transitive description: @@ -333,41 +340,34 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.5" rxdart: dependency: transitive description: name: rxdart url: "https://pub.dartlang.org" source: hosted - version: "0.26.0" + version: "0.27.0" rxdart_ext: dependency: "direct main" description: name: rxdart_ext url: "https://pub.dartlang.org" source: hosted - version: "0.0.1" + version: "0.1.0" shelf: dependency: transitive description: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "0.7.9" + version: "1.1.2" shelf_web_socket: dependency: transitive description: name: shelf_web_socket url: "https://pub.dartlang.org" source: hosted - version: "0.2.3" + version: "1.0.1" sky_engine: dependency: transitive description: flutter @@ -435,7 +435,7 @@ packages: name: timing url: "https://pub.dartlang.org" source: hosted - version: "0.1.1+3" + version: "1.0.0" typed_data: dependency: transitive description: @@ -463,7 +463,7 @@ packages: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "2.1.0" yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 21ae134..fc8d749 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: stream_loader description: A flutter plugin for loading content asynchronously with Dart stream. RxDart loader bloc. -version: 1.1.0 +version: 1.2.0 homepage: https://github.com/hoc081098/stream_loader.git repository: https://github.com/hoc081098/stream_loader.git issue_tracker: https://github.com/hoc081098/stream_loader/issues @@ -10,15 +10,15 @@ environment: dependencies: disposebag: ^1.5.0 - distinct_value_connectable_stream: ^1.2.0 - rxdart_ext: ^0.0.1 + distinct_value_connectable_stream: ^1.3.0 + rxdart_ext: ^0.1.0 flutter: sdk: flutter meta: ^1.3.0 dev_dependencies: - mockito: ^5.0.3 + mockito: ^5.0.7 pedantic: ^1.11.0 - build_runner: ^1.12.2 + build_runner: ^2.0.2 flutter_test: sdk: flutter diff --git a/test/loader_bloc_test.dart b/test/loader_bloc_test.dart index 670fa77..fa079c1 100644 --- a/test/loader_bloc_test.dart +++ b/test/loader_bloc_test.dart @@ -1,5 +1,4 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:rxdart_ext/rxdart_ext.dart'; import 'package:stream_loader/src/loader_bloc.dart'; import 'package:stream_loader/src/loader_message.dart'; import 'package:stream_loader/src/loader_state.dart'; @@ -66,7 +65,7 @@ void main() { initialContent: initialContent, ); - expect(loaderBloc.state$.requireValue, initialState); + expect(loaderBloc.state$.value, initialState); final expectFuture = expectLater( loaderBloc.state$, emitsInOrder([