Introduce null safety (fluttercommunity#155)

Adds null safety via version 3.0.0-beta.1

.ci/Dockerfile

@@ -1,8 +1,9 @@
 # https://github.com/cirruslabs/docker-images-flutter/blob/master/.cirrus.yml
-FROM cirrusci/flutter:1.22.5
+FROM cirrusci/flutter:2.1.0-12.2.pre
 
 RUN yes | sdkmanager \
     "platforms;android-29" \
+    "build-tools;28.0.3" \
     "build-tools;29.0.3" \
     "extras;google;m2repository" \
     "extras;android;m2repository" \

.cirrus.yml

@@ -83,6 +83,7 @@ ios_task:
   install_swiftlint_script:
     - brew install swiftlint
   test_script:
+    - flutter channel beta
     - flutter upgrade
     - flutter test
   build_script:

.fvm/fvm_config.json

@@ -0,0 +1,3 @@
+{
+  "flutterSdkVersion": "beta"
+}

.gitignore

@@ -46,3 +46,4 @@ build/
 .classpath
 .settings
 .last_build_id
+.fvm/flutter_sdk

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.0-beta.1
+
+- Migrate to nullsafety
+
 ## 2.0.0-beta.6
 
 - Android: Ensure to properly unregister upload observers

example/backend/functions/package.json

@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "busboy": "^0.3.0",
-    "firebase-admin": "^8.6.1",
-    "firebase-functions": "^3.3.0",
+    "firebase-admin": "^9.6.0",
+    "firebase-functions": "^3.13.2",
     "md5-file": "^4.0.0"
   },
   "devDependencies": {
@@ -23,4 +23,4 @@
   "engines": {
     "node": "10"
   }
-}
+}

example/integration_test/flutter_uploader_test.dart

@@ -15,7 +15,7 @@ final baseUrl = Uri.parse(
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
-  FlutterUploader uploader;
+  late FlutterUploader uploader;
   var tempFilePaths = <String>[];
 
   setUp(() {
@@ -33,13 +33,14 @@ void main() {
     tempFilePaths.clear();
   });
 
-  Function(UploadTaskResponse) isCompleted(String taskId) {
-    return (response) =>
-        response.taskId == taskId &&
-        response.status == UploadTaskStatus.complete;
+  bool Function(UploadTaskResponse) isCompleted(String taskId) {
+    return (response) {
+      return response.taskId == taskId &&
+          response.status == UploadTaskStatus.complete;
+    };
   }
 
-  Function(UploadTaskResponse) isFailed(String taskId) {
+  bool Function(UploadTaskResponse) isFailed(String taskId) {
     return (response) =>
         response.taskId == taskId && response.status == UploadTaskStatus.failed;
   }
@@ -57,7 +58,7 @@ void main() {
       expect(taskId, isNotNull);
 
       final res = await uploader.result.firstWhere(isCompleted(taskId));
-      final json = jsonDecode(res.response);
+      final json = jsonDecode(res.response!);
 
       expect(json['message'], 'Successfully uploaded');
       expect(res.statusCode, 200);
@@ -105,7 +106,7 @@ void main() {
       expect(taskId, isNotNull);
 
       final res = await uploader.result.firstWhere(isCompleted(taskId));
-      final json = jsonDecode(res.response);
+      final json = jsonDecode(res.response!);
 
       expect(json['request']['fields']['simpleKey'], 'simpleValue');
       expect(jsonDecode(json['request']['fields']['listOf']),
@@ -125,7 +126,7 @@ void main() {
         headers: {'Accept': 'application/json, charset=utf-8'},
       ));
       final res = await uploader.result.firstWhere(isCompleted(taskId));
-      final json = jsonDecode(res.response);
+      final json = jsonDecode(res.response!);
 
       expect(json['request']['headers']['accept'],
           'application/json, charset=utf-8');
@@ -142,7 +143,7 @@ void main() {
       expect(taskId, isNotNull);
 
       final res = await uploader.result.firstWhere(isCompleted(taskId));
-      final json = jsonDecode(res.response);
+      final json = jsonDecode(res.response!);
 
       expect(json['message'], 'Successfully uploaded');
       expect(res.statusCode, 200);
@@ -203,8 +204,7 @@ void main() {
       expect(taskId, isNotNull);
 
       final res = await uploader.result.firstWhere(isCompleted(taskId));
-
-      final json = jsonDecode(res.response);
+      final json = jsonDecode(res.response!);
 
       expect(json['message'], 'Successfully uploaded');
       expect(res.statusCode, 200);
@@ -238,7 +238,7 @@ void main() {
         headers: {'Accept': 'application/json, charset=utf-8'},
       ));
       final res = await uploader.result.firstWhere(isCompleted(taskId));
-      final json = jsonDecode(res.response);
+      final json = jsonDecode(res.response!);
 
       expect(json['headers']['accept'], 'application/json, charset=utf-8');
     });

example/lib/main.dart

@@ -43,7 +43,7 @@ void backgroundHandler() {
               'FlutterUploader.Example',
               'FlutterUploader',
               'Installed when you activate the Flutter Uploader Example',
-              progress: progress.progress,
+              progress: progress.progress ?? 0,
               icon: 'ic_upload',
               enableVibration: false,
               importance: Importance.low,
@@ -108,9 +108,7 @@ void backgroundHandler() {
 void main() => runApp(App());
 
 class App extends StatefulWidget {
-  final Widget child;
-
-  App({Key key, this.child}) : super(key: key);
+  App({Key? key}) : super(key: key);
 
   @override
   _AppState createState() => _AppState();
@@ -133,7 +131,7 @@ class _AppState extends State<App> {
       requestBadgePermission: false,
       requestAlertPermission: true,
       onDidReceiveLocalNotification:
-          (int id, String title, String body, String payload) async {},
+          (int id, String? title, String? body, String? payload) async {},
     );
     var initializationSettings = InitializationSettings(
         android: initializationSettingsAndroid, iOS: initializationSettingsIOS);

example/lib/responses_screen.dart

@@ -10,8 +10,8 @@ import 'package:flutter_uploader_example/upload_item_view.dart';
 /// Shows the statusresponses for previous uploads.
 class ResponsesScreen extends StatefulWidget {
   ResponsesScreen({
-    Key key,
-    @required this.uploader,
+    Key? key,
+    required this.uploader,
   }) : super(key: key);
 
   final FlutterUploader uploader;
@@ -21,8 +21,8 @@ class ResponsesScreen extends StatefulWidget {
 }
 
 class _ResponsesScreenState extends State<ResponsesScreen> {
-  StreamSubscription<UploadTaskProgress> _progressSubscription;
-  StreamSubscription<UploadTaskResponse> _resultSubscription;
+  StreamSubscription<UploadTaskProgress>? _progressSubscription;
+  StreamSubscription<UploadTaskResponse>? _resultSubscription;
 
   Map<String, UploadItem> _tasks = {};
 
@@ -44,7 +44,7 @@ class _ResponsesScreenState extends State<ResponsesScreen> {
       setState(() => _tasks = tmp);
     }, onError: (ex, stacktrace) {
       print('exception: $ex');
-      print('stacktrace: $stacktrace' ?? 'no stacktrace');
+      print('stacktrace: $stacktrace');
     });
 
     _resultSubscription = widget.uploader.result.listen((result) {
@@ -54,12 +54,12 @@ class _ResponsesScreenState extends State<ResponsesScreen> {
       var tmp = <String, UploadItem>{}..addAll(_tasks);
       tmp.putIfAbsent(result.taskId, () => UploadItem(result.taskId));
       tmp[result.taskId] =
-          tmp[result.taskId].copyWith(status: result.status, response: result);
+          tmp[result.taskId]!.copyWith(status: result.status, response: result);
 
       setState(() => _tasks = tmp);
     }, onError: (ex, stacktrace) {
       print('exception: $ex');
-      print('stacktrace: $stacktrace' ?? 'no stacktrace');
+      print('stacktrace: $stacktrace');
     });
   }
 

example/lib/upload_item.dart

@@ -6,11 +6,11 @@ import 'package:flutter_uploader/flutter_uploader.dart';
 
 class UploadItem extends Equatable {
   final String id;
-  final int progress;
-  final UploadTaskStatus status;
+  final int? progress;
+  final UploadTaskStatus? status;
 
   /// Store the entire response object.
-  final UploadTaskResponse response;
+  final UploadTaskResponse? response;
 
   const UploadItem(
     this.id, {
@@ -20,10 +20,10 @@ class UploadItem extends Equatable {
   });
 
   UploadItem copyWith({
-    String id,
-    int progress,
-    UploadTaskStatus status,
-    UploadTaskResponse response,
+    String? id,
+    int? progress,
+    UploadTaskStatus? status,
+    UploadTaskResponse? response,
   }) {
     return UploadItem(
       id ?? this.id,
@@ -39,7 +39,7 @@ class UploadItem extends Equatable {
       status == UploadTaskStatus.failed;
 
   @override
-  List<Object> get props {
+  List<Object?> get props {
     return [
       id,
       progress,

example/lib/upload_item_view.dart

@@ -12,9 +12,9 @@ class UploadItemView extends StatelessWidget {
   final CancelUploadCallback onCancel;
 
   UploadItemView({
-    Key key,
-    this.item,
-    this.onCancel,
+    Key? key,
+    required this.item,
+    required this.onCancel,
   }) : super(key: key);
 
   @override
@@ -29,13 +29,13 @@ class UploadItemView extends StatelessWidget {
                 item.id,
                 style: Theme.of(context)
                     .textTheme
-                    .caption
+                    .caption!
                     .copyWith(fontFamily: 'monospace'),
               ),
               Container(
                 height: 5.0,
               ),
-              Text(item.status.description),
+              Text(item.status!.description),
               // if (item.status == UploadTaskStatus.complete &&
               //     item.remoteHash != null)
               //   Builder(builder: (context) {
@@ -50,16 +50,16 @@ class UploadItemView extends StatelessWidget {
               //   }),
               Container(height: 5.0),
               if (item.status == UploadTaskStatus.running)
-                LinearProgressIndicator(value: item.progress.toDouble() / 100),
+                LinearProgressIndicator(value: item.progress!.toDouble() / 100),
               if (item.status == UploadTaskStatus.complete ||
                   item.status == UploadTaskStatus.failed) ...[
-                Text('HTTP status code: ${item.response.statusCode}'),
-                if (item.response.response != null)
+                Text('HTTP status code: ${item.response!.statusCode}'),
+                if (item.response!.response != null)
                   Text(
-                    item.response.response,
+                    item.response!.response!,
                     style: Theme.of(context)
                         .textTheme
-                        .caption
+                        .caption!
                         .copyWith(fontFamily: 'monospace'),
                   ),
               ]