commit 53e002aee859698e9d2da329ef1d8ec075de63c0
author Phil Quitslund <pq@users.noreply.github.com> Fri Nov 20 09:59:49 2020 -0800
committer GitHub <noreply@github.com> Fri Nov 20 09:59:49 2020 -0800
tree 405a57c59806fe6e7f2e627b4257a866c57fa898
parent 4c0ec3783f570dd427d66a27e001372b0f8d5f68
parent 6cb4350a7bf60135ab9ae845fc591cb8ab8b715a

Merge pull request #149 from dart-lang/nnbd_deps

fix null-safety issues

lib/src/usage_impl.dart

diff --git a/lib/src/usage_impl.dart b/lib/src/usage_impl.dart
index c94b4e5..73acc24 100644
--- a/lib/src/usage_impl.dart
+++ b/lib/src/usage_impl.dart
@@ -202,7 +202,7 @@
     Future f = Future.wait(_futures).catchError((e) => null);
 
     if (timeout != null) {
-      f = f.timeout(timeout, onTimeout: () => null);
+      f = f.timeout(timeout, onTimeout: () => []);
     }
 
     return f;

pubspec.yaml

diff --git a/pubspec.yaml b/pubspec.yaml
index 257679b..9613c34 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,4 +15,4 @@
 
 dev_dependencies:
   pedantic: ^1.9.0
-  test: ^1.0.0
+  test: ^1.16.0-nullsafety