chore: update bloc

lib/auth/auth_bloc.dart

@@ -9,10 +9,7 @@ import 'bloc.dart';
 class AuthBloc extends Bloc<AuthEvent, AuthState> {
   final AuthRepository userRepository;
 
-  AuthBloc(this.userRepository);
-
-  @override
-  AuthState get initialState => AuthUninitialized();
+  AuthBloc(this.userRepository) : super(AuthUninitialized());
 
   @override
   Stream<AuthState> mapEventToState(AuthEvent event) async* {

lib/bloc_delegate.dart

@@ -2,16 +2,16 @@ import 'package:bloc/bloc.dart';
 import 'package:logging/logging.dart';
 
 /// BlocDelegate which logs all BLOC events, errors and transitions.
-class SimpleBlocDelegate extends BlocDelegate {
+class SimpleBlocDelegate extends BlocObserver {
   @override
   void onEvent(Bloc bloc, Object event) {
     super.onEvent(bloc, event);
     Logger.root.info(event);
   }
 
   @override
-  void onError(Bloc bloc, Object error, StackTrace stacktrace) {
-    super.onError(bloc, error, stacktrace);
+  void onError(Cubit cubit, Object error, StackTrace stacktrace) {
+    super.onError(cubit, error, stacktrace);
     Logger.root.severe(error);
   }
 

lib/main.dart

@@ -12,7 +12,7 @@ import 'package:toast/toast.dart';
 
 void main() {
   // Logs all BLoC transitions
-  BlocSupervisor.delegate = SimpleBlocDelegate();
+  Bloc.observer = SimpleBlocDelegate();
   _setupLogging();
 
   // Providing app-wide auth bloc, so that app state changes immediately when

lib/screens/home/bloc/home_bloc.dart

@@ -5,8 +5,7 @@ import 'package:bloc/bloc.dart';
 import './bloc.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
-  @override
-  HomeState get initialState => HomeScreenStats();
+  HomeBloc() : super(HomeScreenStats());
 
   @override
   Stream<HomeState> mapEventToState(HomeEvent event) async* {

lib/screens/home/pages/members/bloc/members_page_bloc.dart

@@ -12,9 +12,9 @@ import './bloc.dart';
 class MembersPageBloc extends Bloc<MembersPageEvent, MembersPageState> {
   final UserRepository userRepository;
   int pageNumber = 1;
-  MembersPageBloc({@required this.userRepository}) : assert(userRepository != null);
-  @override
-  MembersPageState get initialState => MembersPageInitial();
+  MembersPageBloc({@required this.userRepository})
+      : assert(userRepository != null),
+        super(MembersPageInitial());
 
   @override
   Stream<MembersPageState> mapEventToState(MembersPageEvent event) async* {
@@ -53,7 +53,6 @@ class MembersPageBloc extends Bloc<MembersPageEvent, MembersPageState> {
   }
 
   Stream<MembersPageState> _mapEventToMembersRefresh(MembersPageEvent event) async* {
-    final currentState = state;
 
     if (event is MembersPageRefresh) {
       try {

lib/screens/home/pages/profile/bloc/profile_page_bloc.dart

@@ -14,10 +14,9 @@ class ProfilePageBloc extends Bloc<ProfilePageEvent, ProfilePageState> {
   final UserRepository userRepository;
   User _user; // User object which will receive possible edits
 
-  ProfilePageBloc({@required this.userRepository}) : assert(userRepository != null);
-
-  @override
-  ProfilePageState get initialState => ProfilePageInitial();
+  ProfilePageBloc({@required this.userRepository})
+      : assert(userRepository != null),
+        super(ProfilePageInitial());
 
   @override
   Stream<ProfilePageState> mapEventToState(ProfilePageEvent event) async* {

lib/screens/home/pages/profile/profile_page.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:mentorship_client/extensions/context.dart';
 import 'package:mentorship_client/remote/models/user.dart';
-import 'package:mentorship_client/remote/repositories/user_repository.dart';
 import 'package:mentorship_client/screens/home/pages/profile/bloc/bloc.dart';
 import 'package:mentorship_client/widgets/loading_indicator.dart';
 import 'dart:async';

lib/screens/home/pages/relation/bloc/relation_page_bloc.dart

@@ -18,10 +18,8 @@ class RelationPageBloc extends Bloc<RelationPageEvent, RelationPageState> {
 
   RelationPageBloc({@required this.relationRepository, @required this.taskRepository})
       : assert(relationRepository != null),
-        assert(taskRepository != null);
-
-  @override
-  RelationPageState get initialState => RelationPageLoading();
+        assert(taskRepository != null),
+        super(RelationPageLoading());
 
   @override
   Stream<RelationPageState> mapEventToState(RelationPageEvent event) async* {

lib/screens/home/pages/relation/relation_page.dart

@@ -210,7 +210,7 @@ class _RelationPageState extends State<RelationPage> {
               Task task = state.tasks[index];
               //ignore: close_sinks
               final bloc = BlocProvider.of<RelationPageBloc>(context);
-              
+
               return Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [

lib/screens/home/pages/requests/bloc/requests_page_bloc.dart

@@ -12,10 +12,9 @@ import './bloc.dart';
 class RequestsPageBloc extends Bloc<RequestsPageEvent, RequestsPageState> {
   final RelationRepository relationRepository;
 
-  RequestsPageBloc({@required this.relationRepository}) : assert(relationRepository != null);
-
-  @override
-  RequestsPageState get initialState => RequestsPageLoading();
+  RequestsPageBloc({@required this.relationRepository})
+      : assert(relationRepository != null),
+        super(RequestsPageLoading());
 
   @override
   Stream<RequestsPageState> mapEventToState(RequestsPageEvent event) async* {

lib/screens/home/pages/requests/requests_page.dart

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:mentorship_client/extensions/datetime.dart';
 import 'package:mentorship_client/remote/models/relation.dart';
-import 'package:mentorship_client/screens/home/pages/members/bloc/bloc.dart';
 import 'package:mentorship_client/screens/home/pages/requests/bloc/bloc.dart';
 import 'package:mentorship_client/screens/request_detail/request_detail.dart';
 import 'package:mentorship_client/widgets/bold_text.dart';

lib/screens/home/pages/stats/bloc/stats_page_bloc.dart

@@ -11,10 +11,9 @@ import './bloc.dart';
 class StatsPageBloc extends Bloc<StatsPageEvent, StatsPageState> {
   final UserRepository userRepository;
 
-  StatsPageBloc({this.userRepository}) : assert(userRepository != null);
-
-  @override
-  StatsPageState get initialState => StatsPageInitial();
+  StatsPageBloc({this.userRepository})
+      : assert(userRepository != null),
+        super(StatsPageInitial());
 
   @override
   Stream<StatsPageState> mapEventToState(StatsPageEvent event) async* {

lib/screens/home/pages/stats/stats_page.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:mentorship_client/remote/models/task.dart';
-import 'package:mentorship_client/remote/repositories/user_repository.dart';
 import 'package:mentorship_client/screens/home/pages/stats/bloc/bloc.dart';
 import 'package:mentorship_client/widgets/loading_indicator.dart';
 import 'dart:async';

lib/screens/login/bloc/login_bloc.dart

@@ -10,10 +10,7 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   final AuthRepository authRepository;
   final AuthBloc authBloc;
 
-  LoginBloc(this.authRepository, this.authBloc);
-
-  @override
-  get initialState => LoginInitial();
+  LoginBloc(this.authRepository, this.authBloc) : super(LoginInitial());
 
   @override
   Stream<LoginState> mapEventToState(event) async* {

lib/screens/request_detail/bloc/request_detail_bloc.dart

@@ -12,10 +12,9 @@ import './bloc.dart';
 class RequestDetailBloc extends Bloc<RequestDetailEvent, RequestDetailState> {
   final RelationRepository relationRepository;
 
-  RequestDetailBloc({@required this.relationRepository}) : assert(relationRepository != null);
-
-  @override
-  RequestDetailState get initialState => InitialRequestDetailState();
+  RequestDetailBloc({@required this.relationRepository})
+      : assert(relationRepository != null),
+        super(InitialRequestDetailState());
 
   @override
   Stream<RequestDetailState> mapEventToState(RequestDetailEvent event) async* {

lib/screens/send_request/bloc/send_request_bloc.dart

@@ -12,10 +12,9 @@ import './bloc.dart';
 class SendRequestBloc extends Bloc<SendRequestEvent, SendRequestState> {
   final RelationRepository relationRepository;
 
-  SendRequestBloc({@required this.relationRepository}) : assert(relationRepository != null);
-
-  @override
-  SendRequestState get initialState => InitialSendRequestState();
+  SendRequestBloc({@required this.relationRepository})
+      : assert(relationRepository != null),
+        super(InitialSendRequestState());
 
   @override
   Stream<SendRequestState> mapEventToState(SendRequestEvent event) async* {

pubspec.lock

@@ -49,7 +49,7 @@ packages:
       name: bloc
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
+    version: "6.0.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -264,7 +264,7 @@ packages:
       name: flutter_bloc
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.1"
+    version: "6.0.1"
   flutter_native_splash:
     dependency: "direct dev"
     description:
@@ -484,7 +484,7 @@ packages:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.5"
+    version: "4.3.1"
   pub_semver:
     dependency: transitive
     description:
@@ -674,4 +674,4 @@ packages:
     version: "2.2.0"
 sdks:
   dart: ">=2.7.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.5 <2.0.0"
+  flutter: ">=1.16.0 <2.0.0"

pubspec.yaml

@@ -34,9 +34,10 @@ dependencies:
   auto_size_text: ^2.1.0
   flappy_search_bar: ^1.7.2
   # Bloc
-  bloc: ^4.0.0
-  flutter_bloc: ^4.0.1
+  bloc: ^6.0.1
+  flutter_bloc: ^6.0.1
   chopper: ^3.0.3
+
 
 # plugins not needed in app
 dev_dependencies: