fix merge changes

examples/marvel/lib/src/marvel.dart

@@ -20,7 +20,7 @@ part 'marvel.g.dart';
 
 final dioProvider = Provider((ref) => Dio());
 
-final repositoryProvider = Provider((ref) => MarvelRepository(ref));
+const repositoryProvider = Provider(MarvelRepository.new);
 
 class MarvelRepository {
   MarvelRepository(

packages/riverpod/example/pubspec.yaml

@@ -3,13 +3,13 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
   crypto: ^3.0.0
+  dio: ^4.0.0
+  freezed_annotation: ^2.0.0
   json_annotation: ^4.6.0
-  dio: ^4.0.6
-  freezed_annotation: ^2.1.0
   riverpod:
     path: ..
 

packages/riverpod/lib/riverpod.dart

@@ -12,28 +12,23 @@ export 'package:state_notifier/state_notifier.dart' hide Listener, LocatorMixin;
 export 'src/common.dart' hide AsyncTransition;
 
 export 'src/framework.dart'
-    show
-        Create,
-        // ignore: deprecated_member_use_from_same_package
-        Reader,
-        AlwaysAliveProviderBase,
-        Family,
-        CircularDependencyError,
-        ProviderBase,
-        Override,
-        AutoDisposeRef,
-        Ref,
-        ProviderListenable,
-        ProviderContainer,
-        ProviderObserver,
-        ProviderSubscription,
-        AutoDisposeProviderBase,
-        AutoDisposeProviderElementBase,
-        ProviderElementBase,
-        ProviderOverride,
+    hide
+        FamilyCreate,
+        AsyncSelector,
+        FamilyBase,
+        AutoDisposeProviderElementMixin,
         FamilyOverride,
+        NotifierFamilyBase,
+        SetupFamilyOverride,
         SetupOverride,
-        AlwaysAliveProviderListenable;
+        AutoDisposeNotifierFamilyBase,
+        ProviderOverride,
+        AutoDisposeFamilyBase,
+        AlwaysAliveAsyncSelector,
+        handleFireImmediately,
+        Create,
+        Node,
+        ProviderElementProxy;
 
 export 'src/future_provider.dart';