fix(pubspecs): changed dart maximium version and runned dart fix all …

…in all files.
gbtb16 · Jan 15, 2024 · 855fd51 · 855fd51
1 parent fe110bc
commit 855fd51
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 37 deletions.
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.1.0
 homepage: https://github.com/gbtb16/kiwi
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: '>=2.14.0 <4.0.0'
 
 dependencies:
   kiwi: ^4.0.3

diff --git a/flutter_example/lib/screen/main_screen.dart b/flutter_example/lib/screen/main_screen.dart
@@ -19,8 +19,7 @@ class MainScreen extends StatelessWidget {
           MaterialButton(
             color: Theme.of(context).primaryColor,
             onPressed: () async {
-              await Navigator.of(context).push(
-                  MaterialPageRoute(builder: (context) => ResolveScreen()));
+              await Navigator.of(context).push(MaterialPageRoute(builder: (context) => ResolveScreen()));
               KiwiContainer().clear();
             },
             child: Text(
@@ -33,8 +32,7 @@ class MainScreen extends StatelessWidget {
           MaterialButton(
             color: Theme.of(context).primaryColor,
             onPressed: () async {
-              await Navigator.of(context)
-                  .push(MaterialPageRoute(builder: (context) => ErrorScreen()));
+              await Navigator.of(context).push(MaterialPageRoute(builder: (context) => ErrorScreen()));
               KiwiContainer().clear();
             },
             child: Text(
@@ -47,8 +45,7 @@ class MainScreen extends StatelessWidget {
           MaterialButton(
             color: Theme.of(context).primaryColor,
             onPressed: () async {
-              await Navigator.of(context).push(
-                  MaterialPageRoute(builder: (context) => ScopedScreen()));
+              await Navigator.of(context).push(MaterialPageRoute(builder: (context) => ScopedScreen()));
               KiwiContainer().clear();
             },
             child: Text(

diff --git a/flutter_example/pubspec.yaml b/flutter_example/pubspec.yaml
@@ -3,7 +3,7 @@ description: A Flutter example for kiwi
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.14.0 <3.0.0"
+  sdk: ">=2.14.0 <4.0.0"
 
 dependencies:
   flutter:

diff --git a/kiwi/lib/kiwi.dart b/kiwi/lib/kiwi.dart
@@ -1,6 +1,6 @@
 library kiwi;
 
-export 'src/kiwi_container.dart';
 export 'src/annotations.dart';
+export 'src/kiwi_container.dart';
 export 'src/model/exception/kiwi_error.dart';
 export 'src/model/exception/not_registered_error.dart';
diff --git a/kiwi/lib/src/kiwi_container.dart b/kiwi/lib/src/kiwi_container.dart
@@ -8,8 +8,7 @@ typedef T Factory<T>(KiwiContainer container);
 /// A simple service container.
 class KiwiContainer {
   /// Creates a scoped container.
-  KiwiContainer.scoped()
-      : _namedProviders = Map<String?, Map<Type, _Provider<Object>>>();
+  KiwiContainer.scoped() : _namedProviders = Map<String?, Map<Type, _Provider<Object>>>();
 
   static final KiwiContainer _instance = KiwiContainer.scoped();
 
@@ -141,14 +140,10 @@ class KiwiContainer {
 
   void _setProvider<T>(String? name, _Provider<T> provider) {
     final nameProviders = _namedProviders;
-    if (!silent &&
-        (nameProviders.containsKey(name) &&
-            nameProviders[name]!.containsKey(T))) {
-      throw KiwiError(
-          'The type `$T` was already registered${name == null ? '' : ' for the name `$name`'}');
+    if (!silent && (nameProviders.containsKey(name) && nameProviders[name]!.containsKey(T))) {
+      throw KiwiError('The type `$T` was already registered${name == null ? '' : ' for the name `$name`'}');
     }
-    _namedProviders.putIfAbsent(name, () => Map<Type, _Provider<Object>>())[T] =
-        provider as _Provider<Object>;
+    _namedProviders.putIfAbsent(name, () => Map<Type, _Provider<Object>>())[T] = provider as _Provider<Object>;
   }
 }
 
@@ -183,4 +178,4 @@ class _Provider<T> {
 
     return null;
   }
-}
+}
diff --git a/kiwi/pubspec.yaml b/kiwi/pubspec.yaml
@@ -4,7 +4,7 @@ version: 4.1.0
 homepage: https://github.com/gbtb16/kiwi/tree/master/kiwi
 
 environment:
-  sdk: ">=2.14.0 <3.0.0"
+  sdk: ">=2.14.0 <4.0.0"
 
 dependencies:
   meta: ^1.8.0

diff --git a/kiwi_generator/example/kiwi_generator_example.g.dart b/kiwi_generator/example/kiwi_generator_example.g.dart
diff --git a/kiwi_generator/pubspec.yaml b/kiwi_generator/pubspec.yaml
@@ -4,7 +4,7 @@ version: 4.1.0
 homepage: https://github.com/gbtb16/kiwi/tree/master/kiwi_generator
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: '>=2.14.0 <4.0.0'
 
 dependencies:
   analyzer: ^5.4.0

diff --git a/kiwi_generator/test/utils/analysis.dart b/kiwi_generator/test/utils/analysis.dart
@@ -9,8 +9,7 @@ import 'package:source_gen/source_gen.dart';
 Future<LibraryReader> resolveCompilationUnit(String sourceFile) async {
   var files = [File(sourceFile)];
 
-  var fileMap = Map<String, String>.fromEntries(files.map(
-      (f) => MapEntry('a|lib/${p.basename(f.path)}', f.readAsStringSync())));
+  var fileMap = Map<String, String>.fromEntries(files.map((f) => MapEntry('a|lib/${p.basename(f.path)}', f.readAsStringSync())));
 
   var library = await resolveSources(fileMap, (item) async {
     var assetId = AssetId.parse(fileMap.keys.first);

diff --git a/tool/actions/pubspec.yaml b/tool/actions/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.1.0
 homepage: https://github.com/gbtb16/kiwi
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: '>=2.14.0 <4.0.0'
 
 dev_dependencies:
   test: ^1.23.1