Merge null safety branch into master (flutter#18)

Author: jakemac53

.travis.yml

@@ -1,22 +1,13 @@
 language: dart
 
 dart:
-- dev
-- 2.1.1
+- preview/raw/2.10.0-0.2-dev
 
 dart_task:
   - test: -p vm,chrome
-
-matrix:
-  include:
-  - dart: dev
-    dart_task: dartfmt
-  - dart: dev
-    dart_task:
-      dartanalyzer: --fatal-lints --fatal-warnings .
-  - dart: 2.1.1
-    dart_task:
-      dartanalyzer: --fatal-warnings .
+  - dartfmt
+  - dartanalyzer: --fatal-lints --fatal-warnings .
+      
 
 # Only building master means that we don't run two builds for each pull request.
 branches:

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.0-nullsafety
+
+* Update to null safety.
+
 ## 1.0.1
 
 * Update to lowercase Dart core library constants.

analysis_options.yaml

@@ -2,6 +2,8 @@ include: package:pedantic/analysis_options.yaml
 analyzer:
   strong-mode:
     implicit-casts: false
+  enable-experiment:
+    - non-nullable
 linter:
   rules:
     - always_declare_return_types

lib/src/default.dart

@@ -28,7 +28,7 @@ final _isFinalKey = Object();
 ///
 /// This defaults to the system clock. It can be set within a zone using
 /// [withClock].
-Clock get clock => Zone.current[_clockKey] as Clock ?? const Clock();
+Clock get clock => Zone.current[_clockKey] as Clock? ?? const Clock();
 
 /// Runs [callback] with the given value for the top-level [clock] field.
 ///

lib/src/stopwatch.dart

@@ -34,7 +34,7 @@ class ClockStopwatch implements Stopwatch {
 
   /// The point at which [start] was called most recently, or `null` if this
   /// isn't active.
-  DateTime _start;
+  DateTime? _start;
 
   ClockStopwatch(this._clock);
 
@@ -52,7 +52,7 @@ class ClockStopwatch implements Stopwatch {
   @override
   int get elapsedMicroseconds =>
       _elapsed +
-      (_start == null ? 0 : _clock.now().difference(_start).inMicroseconds);
+      (_start == null ? 0 : _clock.now().difference(_start!).inMicroseconds);
 
   @override
   void start() {

lib/src/utils.dart

@@ -16,8 +16,6 @@
 // because quiver is very large and the amount of code we use from it is very
 // small.
 
-import 'package:meta/meta.dart';
-
 /// The number of days in each month.
 ///
 /// This array uses 1-based month numbers, i.e. January is the 1-st element in
@@ -57,5 +55,5 @@ bool isLeapYear(int year) =>
 /// month back takes us to February 28 (or 29 during a leap year), as February
 /// doesn't have 31-st date.
 int clampDayOfMonth(
-        {@required int year, @required int month, @required int day}) =>
+        {required int year, required int month, required int day}) =>
     day.clamp(1, daysInMonth(year, month)) as int;

pubspec.yaml

@@ -1,14 +1,68 @@
 name: clock
-version: 1.0.2-dev
+version: 1.1.0-nullsafety
 description: A fakeable wrapper for dart:core clock APIs
 homepage: https://github.com/dart-lang/clock
 
 environment:
-  sdk: '>=2.1.1 <3.0.0'
-
-dependencies:
-  meta: ^1.0.0
+  # This must remain a tight constraint until nnbd is stable
+  sdk: '>=2.10.0-0 <2.10.0'
 
 dev_dependencies:
   test: ^1.0.0
   pedantic: ^1.8.0
+
+dependency_overrides:
+  async:
+    git: git://github.com/dart-lang/async.git
+  boolean_selector:
+    git: git://github.com/dart-lang/boolean_selector.git
+  charcode:
+    git: git://github.com/dart-lang/charcode.git
+  collection:
+    git: git://github.com/dart-lang/collection.git
+  js:
+    git:
+      url: git://github.com/dart-lang/sdk.git
+      path: pkg/js
+      ref: 2-10-pkgs
+  matcher:
+    git: git://github.com/dart-lang/matcher.git
+  meta:
+    git:
+      url: git://github.com/dart-lang/sdk.git
+      path: pkg/meta
+      ref: 2-10-pkgs
+  path:
+    git: git://github.com/dart-lang/path.git
+  pedantic:
+    git: git://github.com/dart-lang/pedantic.git
+  pool:
+    git: git://github.com/dart-lang/pool.git
+  source_maps:
+    git: git://github.com/dart-lang/source_maps.git
+  source_map_stack_trace:
+    git: git://github.com/dart-lang/source_map_stack_trace.git
+  source_span:
+    git: git://github.com/dart-lang/source_span.git
+  stack_trace:
+    git: git://github.com/dart-lang/stack_trace.git
+  stream_channel:
+    git: git://github.com/dart-lang/stream_channel.git
+  string_scanner:
+    git: git://github.com/dart-lang/string_scanner.git
+  term_glyph:
+    git: git://github.com/dart-lang/term_glyph.git
+  test_api:
+    git:
+      url: git://github.com/dart-lang/test.git
+      path: pkgs/test_api
+  test_core:
+    git:
+      url: git://github.com/dart-lang/test.git
+      path: pkgs/test_core
+  test:
+    git:
+      url: git://github.com/dart-lang/test.git
+      path: pkgs/test
+  typed_data:
+    git: git://github.com/dart-lang/typed_data.git

test/clock_test.dart

@@ -19,7 +19,7 @@ import 'package:test/test.dart';
 import 'utils.dart';
 
 void main() {
-  Clock clock;
+  late Clock clock;
   setUp(() {
     clock = Clock.fixed(date(2013));
   });

test/stopwatch_test.dart

@@ -25,7 +25,7 @@ void main() {
   });
 
   group('before it starts', () {
-    Stopwatch stopwatch;
+    late Stopwatch stopwatch;
     setUp(() {
       stopwatch = clock.stopwatch();
     });
@@ -47,9 +47,9 @@ void main() {
   });
 
   group('when 12345μs have elapsed', () {
-    DateTime time;
-    Clock clock;
-    Stopwatch stopwatch;
+    late DateTime time;
+    late Clock clock;
+    late Stopwatch stopwatch;
     setUp(() {
       time = date(1990, 11, 8);
       clock = Clock(() => time);

test/utils.dart

@@ -16,10 +16,10 @@ import 'package:clock/clock.dart';
 
 /// A utility function for tersely constructing a [DateTime] with no time
 /// component.
-DateTime date(int year, [int month, int day]) =>
+DateTime date(int year, [int? month, int? day]) =>
     DateTime(year, month ?? 1, day ?? 1);
 
 /// Returns a clock that always returns a date with the given [year], [month],
 /// and [day].
-Clock fixed(int year, [int month, int day]) =>
+Clock fixed(int year, [int? month, int? day]) =>
     Clock.fixed(date(year, month, day));