chore: update sdk and packages (fireship-io#19)

narcodico · web-flow · commit 25af83f89666 · 2022-11-14T15:56:45.000+02:00
* chore: bump dart sdk to &gt;=2.18.0

* chore: update packages

* fix: address lint issues
diff --git a/lib/app/app_bloc_observer.dart b/lib/app/app_bloc_observer.dart
@@ -1,16 +1,16 @@
 import 'dart:developer';
 
-import 'package:bloc/bloc.dart';
+import 'package:shared/shared.dart';
 
 class AppBlocObserver extends BlocObserver {
   @override
-  void onChange(BlocBase bloc, Change change) {
+  void onChange(BlocBase<dynamic> bloc, Change<dynamic> change) {
     super.onChange(bloc, change);
     log('onChange(${bloc.runtimeType}, $change)');
   }
 
   @override
-  void onError(BlocBase bloc, Object error, StackTrace stackTrace) {
+  void onError(BlocBase<dynamic> bloc, Object error, StackTrace stackTrace) {
     log('onError(${bloc.runtimeType}, $error, $stackTrace)');
     super.onError(bloc, error, stackTrace);
   }
diff --git a/lib/app/app_bootstrap.dart b/lib/app/app_bootstrap.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:developer';
 
-import 'package:bloc/bloc.dart';
 import 'package:data_providers/data_providers.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
+import 'package:shared/shared.dart';
 import 'package:ui_toolkit/ui_toolkit.dart';
 
 Future<void> bootstrap(
@@ -25,11 +25,12 @@ Future<void> bootstrap(
 
   await Assets.covers.preload();
 
+  if (blocObserver != null) {
+    Bloc.observer = blocObserver;
+  }
+
   return runZonedGuarded<void>(
-    () => BlocOverrides.runZoned(
-      () async => runApp(await appDelegate()),
-      blocObserver: blocObserver,
-    ),
+    () async => runApp(await appDelegate()),
     onZoneError ??
         (error, stackTrace) => log(error.toString(), stackTrace: stackTrace),
   );
diff --git a/lib/app/cubit/app_cubit.dart b/lib/app/cubit/app_cubit.dart
@@ -44,16 +44,16 @@ class AppCubit extends Cubit<AppState> {
   }
 
   void _onUserFailed(UserFailure failure) {
-    final _state = state;
-    emit(AppState.failure(failure: failure, user: _state.user));
+    final currentState = state;
+    emit(AppState.failure(failure: failure, user: currentState.user));
     if (failure.requiresReauthentication) {
       emit(const AppState.unauthenticated());
     } else {
-      emit(_state);
+      emit(currentState);
     }
   }
 
-  late final StreamSubscription _userSubscription;
+  late final StreamSubscription<User> _userSubscription;
   void _watchUser() {
     _userSubscription = _userRepository.watchUser
         .handleFailure(_onUserFailed)
diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart
@@ -9,9 +9,9 @@ import 'package:quizapp/login/login.dart';
 import 'package:ui_toolkit/ui_toolkit.dart';
 import 'package:user_repository/user_repository.dart';
 
-List<Page> onGenerateAppPages(
+List<Page<void>> onGenerateAppPages(
   AppStatus status,
-  List<Page<dynamic>> pages,
+  List<Page<void>> pages,
 ) {
   if (status.isUnauthenticated) {
     return [LoginPage.page()];
diff --git a/lib/home/view/home_page.dart b/lib/home/view/home_page.dart
@@ -8,7 +8,7 @@ import 'package:shared/shared.dart';
 class HomePage extends StatelessWidget {
   const HomePage._();
 
-  static Page page() => const MaterialPage<void>(
+  static Page<void> page() => const MaterialPage<void>(
         key: ValueKey('home_page'),
         child: HomePage._(),
       );
diff --git a/lib/login/cubit/login_cubit.dart b/lib/login/cubit/login_cubit.dart
@@ -1,5 +1,4 @@
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
+import 'package:shared/shared.dart';
 import 'package:user_repository/user_repository.dart';
 
 part 'login_state.dart';
diff --git a/lib/login/view/login_page.dart b/lib/login/view/login_page.dart
@@ -10,7 +10,7 @@ import 'package:user_repository/user_repository.dart';
 class LoginPage extends StatelessWidget {
   const LoginPage._();
 
-  static Page page() => const MaterialPage<void>(
+  static Page<void> page() => const MaterialPage<void>(
         key: ValueKey('login_page'),
         child: LoginPage._(),
       );
diff --git a/lib/profile/cubit/profile_cubit.dart b/lib/profile/cubit/profile_cubit.dart
@@ -20,7 +20,7 @@ class ProfileCubit extends Cubit<User> {
 
   void _onUserChanged(User user) => emit(user);
 
-  late final StreamSubscription _userSubscription;
+  late final StreamSubscription<User> _userSubscription;
   void _watchUser() {
     _userSubscription = _userRepository.watchUser
         // user/auth failures are handled by the AppCubit
diff --git a/lib/quiz/cubit/quiz_cubit.dart b/lib/quiz/cubit/quiz_cubit.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:quizzes_repository/quizzes_repository.dart';
 import 'package:shared/shared.dart';
 import 'package:user_repository/user_repository.dart';
diff --git a/lib/quiz/view/question_view.dart b/lib/quiz/view/question_view.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:provider/provider.dart';
 import 'package:quizapp/l10n/l10n.dart';
 import 'package:quizapp/quiz/cubit/quiz_cubit.dart';
 import 'package:quizzes_repository/quizzes_repository.dart';
+import 'package:shared/shared.dart';
 import 'package:ui_toolkit/ui_toolkit.dart';
 
 class QuestionView extends StatelessWidget {
diff --git a/lib/quiz/view/quiz_page.dart b/lib/quiz/view/quiz_page.dart
@@ -16,7 +16,7 @@ class QuizPage extends StatelessWidget {
   });
 
   static const name = '/quizpage';
-  static Page page({
+  static Page<void> page({
     required String quizId,
     required VoidCallback onQuizCompleted,
   }) =>
diff --git a/lib/topics/cubit/topics_cubit.dart b/lib/topics/cubit/topics_cubit.dart
@@ -43,7 +43,7 @@ class TopicsCubit extends Cubit<TopicsState> {
     emit(state.fromUser(user));
   }
 
-  late final StreamSubscription _userSubscription;
+  late final StreamSubscription<User> _userSubscription;
   void _watchUser() {
     _userSubscription = _userRepository.watchUser
         // user/auth failures are handled by the AppCubit
diff --git a/lib/topics/view/topic_page.dart b/lib/topics/view/topic_page.dart
@@ -11,7 +11,7 @@ import 'package:user_repository/user_repository.dart';
 class TopicPage extends StatelessWidget {
   const TopicPage._();
 
-  static Page page({required Topic topic}) => MaterialPage<void>(
+  static Page<void> page({required Topic topic}) => MaterialPage<void>(
         key: const ValueKey('topic_page'),
         child: Provider.value(
           value: topic,
diff --git a/lib/topics/view/topics_flow.dart b/lib/topics/view/topics_flow.dart
@@ -9,9 +9,9 @@ import 'package:shared/shared.dart';
 import 'package:topics_repository/topics_repository.dart';
 import 'package:user_repository/user_repository.dart';
 
-List<Page> onGenerateTopicsPages(
+List<Page<void>> onGenerateTopicsPages(
   TopicsFlowState state,
-  List<Page<dynamic>> pages, {
+  List<Page<void>> pages, {
   required VoidCallback onQuizCompleted,
 }) {
   return [
diff --git a/lib/topics/view/topics_page.dart b/lib/topics/view/topics_page.dart
@@ -12,7 +12,7 @@ import 'package:user_repository/user_repository.dart';
 class TopicsPage extends StatelessWidget {
   const TopicsPage._();
 
-  static Page page() => const MaterialPage<void>(
+  static Page<void> page() => const MaterialPage<void>(
         key: ValueKey('topics_page'),
         child: TopicsPage._(),
       );
diff --git a/packages/data_providers/pubspec.yaml b/packages/data_providers/pubspec.yaml
@@ -3,16 +3,16 @@ description: An app package exporting all data providers.
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
-  cloud_firestore: ^3.1.15
-  firebase_auth: ^3.3.18
-  firebase_core: ^1.17.0
+  cloud_firestore: ^4.0.5
+  firebase_auth: ^4.1.2
+  firebase_core: ^2.2.0
   flutter:
     sdk: flutter
-  google_sign_in: ^5.3.1
-  sign_in_with_apple: ^4.0.0
+  google_sign_in: ^5.4.2
+  sign_in_with_apple: ^4.2.0
 
 dev_dependencies:
-  very_good_analysis: ^3.0.0
+  very_good_analysis: ^3.1.0
diff --git a/packages/quizzes_repository/lib/src/models/models.g.dart b/packages/quizzes_repository/lib/src/models/models.g.dart
diff --git a/packages/quizzes_repository/pubspec.yaml b/packages/quizzes_repository/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: none
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
   data_providers:
@@ -15,6 +15,6 @@ dependencies:
     path: ../shared
 
 dev_dependencies:
-  build_runner: ^2.1.11
-  json_serializable: ^6.2.0
-  very_good_analysis: ^3.0.0
+  build_runner: ^2.3.2
+  json_serializable: ^6.5.4
+  very_good_analysis: ^3.1.0
diff --git a/packages/shared/lib/shared.dart b/packages/shared/lib/shared.dart
@@ -3,9 +3,7 @@ library shared;
 export 'package:bloc/bloc.dart';
 export 'package:equatable/equatable.dart';
 export 'package:json_annotation/json_annotation.dart';
-export 'package:meta/meta.dart';
 export 'package:provider/provider.dart';
 export 'package:rxdart/rxdart.dart';
-export 'package:very_good_analysis/very_good_analysis.dart' show unawaited;
 
 export 'src/shared.dart';
diff --git a/packages/shared/pubspec.yaml b/packages/shared/pubspec.yaml
@@ -4,19 +4,19 @@ version: 1.0.0
 publish_to: none
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
-  bloc: ^8.0.3
-  crypto: ^3.0.1
+  bloc: ^8.1.0
+  crypto: ^3.0.2
   data_providers:
     path: ../data_providers
-  equatable: ^2.0.3
+  equatable: ^2.0.5
   flutter:
     sdk: flutter
-  json_annotation: ^4.5.0
-  provider: ^6.0.2
-  rxdart: ^0.27.3
+  json_annotation: ^4.7.0
+  provider: ^6.0.4
+  rxdart: ^0.27.6
 
 dev_dependencies:
-  very_good_analysis: ^3.0.0
+  very_good_analysis: ^3.1.0
diff --git a/packages/topics_repository/lib/src/models/models.g.dart b/packages/topics_repository/lib/src/models/models.g.dart
diff --git a/packages/topics_repository/pubspec.yaml b/packages/topics_repository/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: none
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
   data_providers:
@@ -15,6 +15,6 @@ dependencies:
     path: ../shared
 
 dev_dependencies:
-  build_runner: ^2.1.11
-  json_serializable: ^6.2.0
-  very_good_analysis: ^3.0.0
+  build_runner: ^2.3.2
+  json_serializable: ^6.5.4
+  very_good_analysis: ^3.1.0
diff --git a/packages/ui_toolkit/pubspec.yaml b/packages/ui_toolkit/pubspec.yaml
@@ -4,15 +4,15 @@ version: 1.0.0
 publish_to: none
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
   flutter:
     sdk: flutter
   flutter_spinkit: ^5.1.0
-  font_awesome_flutter: ^10.1.0
-  google_fonts: ^3.0.0
+  font_awesome_flutter: ^10.2.1
+  google_fonts: ^3.0.1
   transparent_image: ^2.0.0
 
 dev_dependencies:
-  very_good_analysis: ^3.0.0
+  very_good_analysis: ^3.1.0
diff --git a/packages/user_repository/lib/src/models/models.g.dart b/packages/user_repository/lib/src/models/models.g.dart
diff --git a/packages/user_repository/pubspec.yaml b/packages/user_repository/pubspec.yaml
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -44,16 +44,16 @@ class AppCubit extends Cubit<AppState> {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`void _onUserFailed(UserFailure failure) {`
`47`		`- final _state = state;`
`48`		`- emit(AppState.failure(failure: failure, user: _state.user));`
	`47`	`+ final currentState = state;`
	`48`	`+ emit(AppState.failure(failure: failure, user: currentState.user));`
`49`	`49`	`if (failure.requiresReauthentication) {`
`50`	`50`	`emit(const AppState.unauthenticated());`
`51`	`51`	`} else {`
`52`		`- emit(_state);`
	`52`	`+ emit(currentState);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- late final StreamSubscription _userSubscription;`
	`56`	`+ late final StreamSubscription<User> _userSubscription;`
`57`	`57`	`void _watchUser() {`
`58`	`58`	`_userSubscription = _userRepository.watchUser`
`59`	`59`	`.handleFailure(_onUserFailed)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import 'dart:async';`
	`2`	`+`
`1`	`3`	`import 'package:quizzes_repository/quizzes_repository.dart';`
`2`	`4`	`import 'package:shared/shared.dart';`
`3`	`5`	`import 'package:user_repository/user_repository.dart';`