Merge pull request #1369 from lifez/master

Compatibility with dart-lang/mockito

@@ -4,10 +4,10 @@ import '../../get_core/get_core.dart';
 /// overrides if you extend the class that uses it, as Dart has no final
 /// overrides if you extend the class that uses it, as Dart has no final
 /// methods.
 /// methods.
 /// Used in [DisposableInterface] to avoid the danger of overriding onStart.
 /// Used in [DisposableInterface] to avoid the danger of overriding onStart.
-class _InternalFinalCallback<T> {
+class InternalFinalCallback<T> {
   ValueUpdater<T>? _callback;
   ValueUpdater<T>? _callback;
 
 
-  _InternalFinalCallback({ValueUpdater<T>? callback}) : _callback = callback;
+  InternalFinalCallback({ValueUpdater<T>? callback}) : _callback = callback;
 
 
   T call() => _callback!.call();
   T call() => _callback!.call();
 }
 }
@@ -26,7 +26,7 @@ mixin GetLifeCycleBase {
   /// It uses an internal "callable" type, to avoid any @overrides in subclases.
   /// It uses an internal "callable" type, to avoid any @overrides in subclases.
   /// This method should be internal and is required to define the
   /// This method should be internal and is required to define the
   /// lifetime cycle of the subclass.
   /// lifetime cycle of the subclass.
-  final onStart = _InternalFinalCallback<void>();
+  final onStart = InternalFinalCallback<void>();
 
 
   // /// The `configureLifeCycle` works as a constructor for the [GetLifeCycle]
   // /// The `configureLifeCycle` works as a constructor for the [GetLifeCycle]
   // ///
   // ///
@@ -36,7 +36,7 @@ mixin GetLifeCycleBase {
   // }
   // }
 
 
   /// Internal callback that starts the cycle of this controller.
   /// Internal callback that starts the cycle of this controller.
-  final onDelete = _InternalFinalCallback<void>();
+  final onDelete = InternalFinalCallback<void>();
 
 
   /// Called immediately after the widget is allocated in memory.
   /// Called immediately after the widget is allocated in memory.
   /// You might use this to initialize something for the controller.
   /// You might use this to initialize something for the controller.

@@ -81,7 +81,7 @@ mixin RxObjectMixin<T> on NotifyManager<T> {
   /// values.
   /// values.
   @override
   @override
   // ignore: avoid_equals_and_hash_code_on_mutable_classes
   // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  bool operator ==(dynamic o) {
+  bool operator ==(Object o) {
     // Todo, find a common implementation for the hashCode of different Types.
     // Todo, find a common implementation for the hashCode of different Types.
     if (o is T) return value == o;
     if (o is T) return value == o;
     if (o is RxObjectMixin<T>) return value == o.value;
     if (o is RxObjectMixin<T>) return value == o.value;
@@ -337,7 +337,7 @@ class Rxn<T> extends Rx<T?> {
   Rxn([T? initial]) : super(initial);
   Rxn([T? initial]) : super(initial);
 
 
   @override
   @override
-  dynamic toJson() {
+  Object toJson() {
     try {
     try {
       return (value as dynamic)?.toJson();
       return (value as dynamic)?.toJson();
     } on Exception catch (_) {
     } on Exception catch (_) {