From d69dec1e08a7d8752adfd0587bbe6081155e7bbb Mon Sep 17 00:00:00 2001
From: Petrus Nguyen Thai Hoc <hoc081098@gmail.com>
Date: Wed, 2 Feb 2022 15:21:00 +0700
Subject: [PATCH 1/2] use clock pkg

---
 lib/src/streams/timer.dart              | 4 +++-
 lib/src/transformers/time_interval.dart | 3 ++-
 lib/src/transformers/timestamp.dart     | 4 +++-
 pubspec.yaml                            | 4 ++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/src/streams/timer.dart b/lib/src/streams/timer.dart
index c456b6673..1472faeaa 100644
--- a/lib/src/streams/timer.dart
+++ b/lib/src/streams/timer.dart
@@ -1,5 +1,7 @@
 import 'dart:async';
 
+import 'package:clock/clock.dart';
+
 /// Emits the given value after a specified amount of time.
 ///
 /// ### Example
@@ -25,7 +27,7 @@ class TimerStream<T> extends Stream<T> {
   }
 
   static StreamController<T> _buildController<T>(T value, Duration duration) {
-    final watch = Stopwatch();
+    final watch = clock.stopwatch();
     Timer? timer;
     late StreamController<T> controller;
     Duration? totalElapsed = Duration.zero;
diff --git a/lib/src/transformers/time_interval.dart b/lib/src/transformers/time_interval.dart
index c0b44d3db..b1f00beb8 100644
--- a/lib/src/transformers/time_interval.dart
+++ b/lib/src/transformers/time_interval.dart
@@ -1,10 +1,11 @@
 import 'dart:async';
 
+import 'package:clock/clock.dart';
 import 'package:rxdart/src/utils/forwarding_sink.dart';
 import 'package:rxdart/src/utils/forwarding_stream.dart';
 
 class _TimeIntervalStreamSink<S> extends ForwardingSink<S, TimeInterval<S>> {
-  final _stopwatch = Stopwatch();
+  final _stopwatch = clock.stopwatch();
 
   @override
   void onData(S data) {
diff --git a/lib/src/transformers/timestamp.dart b/lib/src/transformers/timestamp.dart
index 3a1560f8e..a4d33c6fa 100644
--- a/lib/src/transformers/timestamp.dart
+++ b/lib/src/transformers/timestamp.dart
@@ -1,5 +1,7 @@
 import 'dart:async';
 
+import 'package:clock/clock.dart';
+
 class _TimestampStreamSink<S> implements EventSink<S> {
   final EventSink<Timestamped<S>> _outputSink;
 
@@ -7,7 +9,7 @@ class _TimestampStreamSink<S> implements EventSink<S> {
 
   @override
   void add(S data) {
-    _outputSink.add(Timestamped(DateTime.now(), data));
+    _outputSink.add(Timestamped(clock.now(), data));
   }
 
   @override
diff --git a/pubspec.yaml b/pubspec.yaml
index 62c1ca2af..ea763204f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -8,9 +8,13 @@ repository: https://github.com/ReactiveX/rxdart
 environment:
   sdk: '>=2.12.0 <3.0.0'
 
+dependencies:
+  clock: ^1.1.0
+
 dev_dependencies:
   build_runner: ^2.1.2
   build_web_compilers: ^3.0.0
   lints: ^1.0.1
   stack_trace: ^1.10.0
   test: ^1.17.12
+  fake_async: ^1.2.0

From 09bb2cfa658fb89a8fb686d95ce63e174a6ee274 Mon Sep 17 00:00:00 2001
From: Petrus Nguyen Thai Hoc <hoc081098@gmail.com>
Date: Wed, 2 Feb 2022 15:31:03 +0700
Subject: [PATCH 2/2] rm fake_aysnc

---
 pubspec.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index ea763204f..b9d651ab8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -17,4 +17,3 @@ dev_dependencies:
   lints: ^1.0.1
   stack_trace: ^1.10.0
   test: ^1.17.12
-  fake_async: ^1.2.0