feat(flutter_bloc)!: nullsafety (#2014)

.github/workflows/flutter_bloc.yaml

@@ -20,6 +20,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: subosito/[email protected]
+        with:
+          channel: beta
       - name: Install Dependencies
         run: flutter packages get
       - name: Format

.github/workflows/flutter_examples.yaml

@@ -72,6 +72,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: subosito/[email protected]
+        with:
+          channel: beta
       - name: Install Dependencies
         working-directory: ${{ matrix.folder }}
         run: flutter packages get
@@ -85,7 +87,7 @@ jobs:
         working-directory: ${{ matrix.folder }}
         run: |
           if [ -d "test" ]; then
-            flutter test --no-pub --test-randomize-ordering-seed random      
+            flutter test --no-pub --test-randomize-ordering-seed random --no-sound-null-safety
           fi
   build:
     needs: [examples]

docs/_snippets/flutter_todos_tutorial/filtered_todos.dart.md

@@ -31,7 +31,7 @@ class FilteredTodos extends StatelessWidget {
                 todo: todo,
                 onDismissed: (direction) {
                   BlocProvider.of<TodosBloc>(context).add(TodoDeleted(todo));
-                  Scaffold.of(context).showSnackBar(DeleteTodoSnackBar(
+                  ScaffoldMessenger.of(context).showSnackBar(DeleteTodoSnackBar(
                     key: ArchSampleKeys.snackbar,
                     todo: todo,
                     onUndo: () =>
@@ -46,7 +46,7 @@ class FilteredTodos extends StatelessWidget {
                     }),
                   );
                   if (removedTodo != null) {
-                    Scaffold.of(context).showSnackBar(DeleteTodoSnackBar(
+                    ScaffoldMessenger.of(context).showSnackBar(DeleteTodoSnackBar(
                       key: ArchSampleKeys.snackbar,
                       todo: todo,
                       onUndo: () => BlocProvider.of<TodosBloc>(context)

examples/flutter_bloc_with_stream/lib/bloc/ticker_bloc.dart

@@ -15,7 +15,7 @@ class TickerBloc extends Bloc<TickerEvent, TickerState> {
   TickerBloc(this._ticker) : super(TickerInitial());
 
   final Ticker _ticker;
-  StreamSubscription _subscription;
+  StreamSubscription? _subscription;
 
   @override
   Stream<TickerState> mapEventToState(TickerEvent event) async* {

examples/flutter_bloc_with_stream/lib/main.dart

@@ -17,7 +17,7 @@ void main() {
 /// {@endtemplate}
 class TickerApp extends MaterialApp {
   /// {@macro ticker_app}
-  TickerApp({Key key})
+  TickerApp({Key? key})
       : super(
           key: key,
           home: BlocProvider(

examples/flutter_bloc_with_stream/pubspec.yaml

@@ -1,17 +1,17 @@
 name: flutter_bloc_with_stream
 description: A new Flutter project.
-
 version: 1.0.0+1
+publish_to: none
 
 environment:
-  sdk: ">=2.6.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
   flutter_bloc:
     path: ../../packages/flutter_bloc
-  equatable: ^1.2.5
+  equatable: ^2.0.0-nullsafety.0
 
 flutter:
   uses-material-design: true

examples/flutter_complex_list/lib/list/cubit/list_cubit.dart

@@ -2,13 +2,12 @@ import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_complex_list/list/list.dart';
 import 'package:flutter_complex_list/repository.dart';
-import 'package:meta/meta.dart';
 import 'package:pedantic/pedantic.dart';
 
 part 'list_state.dart';
 
 class ListCubit extends Cubit<ListState> {
-  ListCubit({@required this.repository}) : super(const ListState.loading());
+  ListCubit({required this.repository}) : super(const ListState.loading());
 
   final Repository repository;
 

examples/flutter_complex_list/lib/list/models/item.dart

@@ -1,22 +1,17 @@
-import 'package:meta/meta.dart';
 import 'package:equatable/equatable.dart';
 
 class Item extends Equatable {
   const Item({
-    @required this.id,
-    @required this.value,
+    required this.id,
+    required this.value,
     this.isDeleting = false,
   });
 
   final String id;
   final String value;
   final bool isDeleting;
 
-  Item copyWith({
-    String id,
-    String value,
-    bool isDeleting,
-  }) {
+  Item copyWith({String? id, String? value, bool? isDeleting}) {
     return Item(
       id: id ?? this.id,
       value: value ?? this.value,

examples/flutter_complex_list/lib/list/view/list_page.dart

@@ -24,7 +24,7 @@ class ListPage extends StatelessWidget {
 }
 
 class _ListView extends StatelessWidget {
-  const _ListView({Key key, this.items}) : super(key: key);
+  const _ListView({Key? key, required this.items}) : super(key: key);
 
   final List<Item> items;
 
@@ -48,9 +48,9 @@ class _ListView extends StatelessWidget {
 
 class _ItemTile extends StatelessWidget {
   const _ItemTile({
-    Key key,
-    @required this.item,
-    @required this.onDeletePressed,
+    Key? key,
+    required this.item,
+    required this.onDeletePressed,
   }) : super(key: key);
 
   final Item item;

examples/flutter_complex_list/pubspec.yaml

@@ -1,18 +1,18 @@
 name: flutter_complex_list
 description: A new Flutter project.
-
 version: 1.0.0+1
+publish_to: none
 
 environment:
-  sdk: ">=2.6.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
   flutter_bloc:
     path: ../../packages/flutter_bloc
-  equatable: ^1.2.5
-  pedantic: ^1.9.0
+  equatable: ^2.0.0-nullsafety.0
+  pedantic: ^1.10.0-nullsafety.3
 
 flutter:
   uses-material-design: true

examples/flutter_counter/integration_test/app_test.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+// ignore: import_of_legacy_library_into_null_safe
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_counter/main.dart' as app;
 

examples/flutter_counter/ios/Flutter/Debug.xcconfig

@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

examples/flutter_counter/ios/Flutter/Release.xcconfig

@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

examples/flutter_counter/ios/Runner.xcodeproj/project.pbxproj

@@ -219,12 +219,10 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../Flutter/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

examples/flutter_counter/lib/app.dart

@@ -7,5 +7,5 @@ import 'counter/counter.dart';
 /// {@endtemplate}
 class CounterApp extends MaterialApp {
   /// {@macro counter_app}
-  const CounterApp({Key key}) : super(key: key, home: const CounterPage());
+  const CounterApp({Key? key}) : super(key: key, home: const CounterPage());
 }

examples/flutter_counter/lib/counter/view/counter_page.dart

@@ -10,7 +10,7 @@ import 'counter_view.dart';
 /// {@endtemplate}
 class CounterPage extends StatelessWidget {
   /// {@macro counter_page}
-  const CounterPage({Key key}) : super(key: key);
+  const CounterPage({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

examples/flutter_counter/pubspec.yaml

@@ -1,18 +1,24 @@
 name: flutter_counter
 description: A new Flutter project.
-
-publish_to: "none" # Remove this line if you wish to publish to pub.dev
-
 version: 1.0.0+1
+publish_to: none
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  bloc: ^6.1.0
-  flutter_bloc: ^6.1.0
+  bloc:
+    path: ../../packages/bloc
+  flutter_bloc:
+    path: ../../packages/flutter_bloc
+
+dependency_overrides:
+  bloc:
+    path: ../../packages/bloc
+  flutter_bloc:
+    path: ../../packages/flutter_bloc
 
 dev_dependencies:
   flutter_test:

examples/flutter_counter/test/counter/cubit/counter_cubit_test.dart

@@ -1,3 +1,4 @@
+// ignore: import_of_legacy_library_into_null_safe
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter_counter/counter/counter.dart';
 import 'package:flutter_test/flutter_test.dart';

examples/flutter_counter/test/counter/view/counter_view_test.dart

@@ -1,9 +1,11 @@
+// ignore: import_of_legacy_library_into_null_safe
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_counter/counter/counter.dart';
 import 'package:flutter_counter/counter/view/counter_view.dart';
 import 'package:flutter_test/flutter_test.dart';
+// ignore: import_of_legacy_library_into_null_safe
 import 'package:mockito/mockito.dart';
 
 class MockCounterCubit extends MockBloc<int> implements CounterCubit {}
@@ -12,11 +14,12 @@ const _incrementButtonKey = Key('counterView_increment_floatingActionButton');
 const _decrementButtonKey = Key('counterView_decrement_floatingActionButton');
 
 void main() {
-  CounterCubit counterCubit;
+  late CounterCubit counterCubit;
 
   setUp(() {
     counterCubit = MockCounterCubit();
     when(counterCubit.state).thenReturn(0);
+    whenListen(counterCubit, Stream.value(0));
   });
 
   group('CounterView', () {
@@ -55,7 +58,9 @@ void main() {
           ),
         ),
       );
-      await tester.tap(find.byKey(_decrementButtonKey));
+      final decrementFinder = find.byKey(_decrementButtonKey);
+      await tester.ensureVisible(decrementFinder);
+      await tester.tap(decrementFinder);
       verify(counterCubit.decrement()).called(1);
     });
   });

examples/flutter_counter/test_driver/integration_test.dart

@@ -1,3 +1,4 @@
+// ignore: import_of_legacy_library_into_null_safe
 import 'package:integration_test/integration_test_driver.dart';
 
 Future<void> main() => integrationDriver();

examples/flutter_dynamic_form/lib/bloc/new_car_bloc.dart

@@ -8,7 +8,7 @@ part 'new_car_event.dart';
 part 'new_car_state.dart';
 
 class NewCarBloc extends Bloc<NewCarEvent, NewCarState> {
-  NewCarBloc({NewCarRepository newCarRepository})
+  NewCarBloc({required NewCarRepository newCarRepository})
       : _newCarRepository = newCarRepository,
         super(NewCarState.initial());
 

examples/flutter_dynamic_form/lib/bloc/new_car_event.dart

@@ -10,17 +10,17 @@ class NewCarFormLoaded extends NewCarEvent {}
 class NewCarBrandChanged extends NewCarEvent {
   const NewCarBrandChanged({this.brand});
 
-  final String brand;
+  final String? brand;
 }
 
 class NewCarModelChanged extends NewCarEvent {
   const NewCarModelChanged({this.model});
 
-  final String model;
+  final String? model;
 }
 
 class NewCarYearChanged extends NewCarEvent {
   const NewCarYearChanged({this.year});
 
-  final String year;
+  final String? year;
 }