Merge pull request #99 from gbtb16/bugfix/kiwi-homepage-ownership

fix(ownership): Fixed where it was pointing to the old repository to point to the new link.
gbtb16 · Jan 15, 2024 · aa93e97 · aa93e97
2 parents 849dc15 + 05a4d49
commit aa93e97
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # kiwi
 
-[![kiwi](https://github.com/vanlooverenkoen/kiwi/actions/workflows/kiwi.yml/badge.svg?branch=master)](https://github.com/vanlooverenkoen/kiwi/actions/workflows/kiwi.yml)
-[![kiwi_generator](https://github.com/vanlooverenkoen/kiwi/actions/workflows/kiwi_generator.yml/badge.svg?branch=master)](https://github.com/vanlooverenkoen/kiwi/actions/workflows/kiwi_generator.yml)
-[![flutter_example](https://github.com/vanlooverenkoen/kiwi/actions/workflows/flutter_example.yml/badge.svg?branch=master)](https://github.com/vanlooverenkoen/kiwi/actions/workflows/flutter_example.yml)
-[![example](https://github.com/vanlooverenkoen/kiwi/actions/workflows/example.yml/badge.svg?branch=master)](https://github.com/vanlooverenkoen/kiwi/actions/workflows/example.yml)
+[![kiwi](https://github.com/gbtb16/kiwi/actions/workflows/kiwi.yml/badge.svg?branch=master)](https://github.com/gbtb16/kiwi/actions/workflows/kiwi.yml)
+[![kiwi_generator](https://github.com/gbtb16/kiwi/actions/workflows/kiwi_generator.yml/badge.svg?branch=master)](https://github.com/gbtb16/kiwi/actions/workflows/kiwi_generator.yml)
+[![flutter_example](https://github.com/gbtb16/kiwi/actions/workflows/flutter_example.yml/badge.svg?branch=master)](https://github.com/gbtb16/kiwi/actions/workflows/flutter_example.yml)
+[![example](https://github.com/gbtb16/kiwi/actions/workflows/example.yml/badge.svg?branch=master)](https://github.com/gbtb16/kiwi/actions/workflows/example.yml)
 
-![Logo](https://raw.githubusercontent.com/vanlooverenkoen/kiwi/master/images/logo.png)
+![Logo](https://raw.githubusercontent.com/gbtb16/kiwi/master/images/logo.png)
 
 A simple yet efficient IoC container for Dart and Flutter, coupled with a powerful generator to allow you to write less code.
 
@@ -21,7 +21,7 @@ While using the generator, only constructor injection is supported.
 
 [![Pub](https://img.shields.io/pub/v/kiwi.svg)](https://pub.dartlang.org/packages/kiwi)
 
-[Source Code](https://github.com/vanlooverenkoen/kiwi/tree/master/kiwi)
+[Source Code](https://github.com/gbtb16/kiwi/tree/master/kiwi)
 
 The core package providing the IoC container and the annotations which has no dependencies.
 
@@ -31,27 +31,27 @@ Import it into your pubspec `dependencies:` section.
 
 [![Pub](https://img.shields.io/pub/v/kiwi_generator.svg)](https://pub.dartlang.org/packages/kiwi_generator)
 
-[Source Code](https://github.com/vanlooverenkoen/kiwi/tree/master/kiwi_generator)
+[Source Code](https://github.com/gbtb16/kiwi/tree/master/kiwi_generator)
 
 The package providing the generator.
 
 Import it into your pubspec `dev_dependencies:` section.
 
 ## Example
 
-[Source Code](https://github.com/vanlooverenkoen/kiwi/tree/master/example)
+[Source Code](https://github.com/gbtb16/kiwi/tree/master/example)
 
 An example showing how to setup `kiwi` and `kiwi_generator`.
 
 ## Flutter Example
 
-[Source Code](https://github.com/vanlooverenkoen/kiwi/tree/master/flutter_example)
+[Source Code](https://github.com/gbtb16/kiwi/tree/master/flutter_example)
 
 An example showing how to setup `kiwi` and `kiwi_generator` inside a Flutter project.
 
 ## Contributions
 
 Feel free to contribute to this project.
 
-If you find a bug or want a feature, but don't know how to fix/implement it, please fill an [issue](https://github.com/vanlooverenkoen/kiwi/issues).  
-If you fixed a bug or implemented a new feature, please send a [pull request](https://github.com/vanlooverenkoen/kiwi/pulls).
+If you find a bug or want a feature, but don't know how to fix/implement it, please fill an [issue](https://github.com/gbtb16/kiwi/issues).  
+If you fixed a bug or implemented a new feature, please send a [pull request](https://github.com/gbtb16/kiwi/pulls).
diff --git a/example/README.md b/example/README.md
@@ -1,6 +1,6 @@
 # Dart Example
 
-An example of how to use [kiwi](https://github.com/vanlooverenkoen/kiwi/tree/master/kiwi) coupled with [kiwi_generator](https://github.com/vanlooverenkoen/kiwi/tree/master/kiwi_generator).
+An example of how to use [kiwi](https://github.com/gbtb16/kiwi/tree/master/kiwi) coupled with [kiwi_generator](https://github.com/gbtb16/kiwi/tree/master/kiwi_generator).
 
 This is an adaptation of the "Coffee" [example from Google/Inject](https://github.com/google/inject.dart/tree/master/example/coffee).
 

diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml
@@ -7,8 +7,7 @@ linter:
   rules:
     - cancel_subscriptions
     - hash_and_equals
-    - iterable_contains_unrelated_type
-    - list_remove_unrelated_type
+    - collection_methods_unrelated_type
     - test_types_in_equals
     - unrelated_type_equality_checks
     - valid_regexps
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,10 +1,10 @@
 name: example
 description: A sample command-line application as an example for kiwi.
 version: 0.1.0
-homepage: https://github.com/vanlooverenkoen/kiwi
+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/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/README.md b/kiwi/README.md
@@ -3,7 +3,7 @@
 [![Pub](https://img.shields.io/pub/v/kiwi.svg)](https://pub.dartlang.org/packages/kiwi)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/RomainRastel)
 
-![Logo](https://raw.githubusercontent.com/vanlooverenkoen/kiwi/master/images/logo.png)
+![Logo](https://raw.githubusercontent.com/gbtb16/kiwi/master/images/logo.png)
 
 A simple yet efficient IoC container for Dart and Flutter.
 
@@ -12,7 +12,7 @@ The container does not rely on reflection, it's just a `Map`, so it's fast.
 **IMPORTANT: Dart2 is required to use this package.**
 
 This package can be used with, or without code generation. While code generation allows you to code faster, it comes with extra configuration on you side (to be setup only one time).
-This section is only about **kiwi** which contains the IoC container and the annotations. If you are looking for the kiwi_generator configuration, you can find documentation [here](https://github.com/vanlooverenkoen/kiwi/tree/master/kiwi_generator).
+This section is only about **kiwi** which contains the IoC container and the annotations. If you are looking for the kiwi_generator configuration, you can find documentation [here](https://github.com/gbtb16/kiwi/tree/master/kiwi_generator).
 
 ## Configuration
 
@@ -197,4 +197,4 @@ In production, or when `silent` is `true`, you will get `null` if you try to res
 
 ## Changelog
 
-Please see the [Changelog](https://github.com/vanlooverenkoen/kiwi/blob/master/kiwi/CHANGELOG.md) page to know what's recently changed.
+Please see the [Changelog](https://github.com/gbtb16/kiwi/blob/master/kiwi/CHANGELOG.md) page to know what's recently changed.
diff --git a/kiwi/analysis_options.yaml b/kiwi/analysis_options.yaml
@@ -7,8 +7,7 @@ linter:
   rules:
     - cancel_subscriptions
     - hash_and_equals
-    - iterable_contains_unrelated_type
-    - list_remove_unrelated_type
+    - collection_methods_unrelated_type
     - test_types_in_equals
     - unrelated_type_equality_checks
     - valid_regexps
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/pubspec.yaml b/kiwi/pubspec.yaml
@@ -1,10 +1,10 @@
 name: kiwi
 description: A simple yet efficient dependency injection container for Dart and Flutter (can be coupled with the kiwi_generator package).
 version: 4.1.0
-homepage: https://github.com/vanlooverenkoen/kiwi/tree/master/kiwi
+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/README.md b/kiwi_generator/README.md
@@ -2,9 +2,9 @@
 
 [![Pub](https://img.shields.io/pub/v/kiwi_generator.svg)](https://pub.dartlang.org/packages/kiwi_generator)
 
-![Logo](https://raw.githubusercontent.com/vanlooverenkoen/kiwi/master/images/logo.png)
+![Logo](https://raw.githubusercontent.com/gbtb16/kiwi/master/images/logo.png)
 
-Generates dependency injection code using the [kiwi](https://github.com/vanlooverenkoen/kiwi) package to reduce development time.
+Generates dependency injection code using the [kiwi](https://github.com/gbtb16/kiwi) package to reduce development time.
 
 ## Configuration
 
@@ -209,4 +209,4 @@ class _$Injector extends Injector {
 
 ## Changelog
 
-Please see the [Changelog](https://github.com/vanlooverenkoen/kiwi/blob/master/kiwi_generator/CHANGELOG.md) page to know what's recently changed.
+Please see the [Changelog](https://github.com/gbtb16/kiwi/blob/master/kiwi_generator/CHANGELOG.md) page to know what's recently changed.
diff --git a/kiwi_generator/analysis_options.yaml b/kiwi_generator/analysis_options.yaml
@@ -7,8 +7,7 @@ linter:
   rules:
     - cancel_subscriptions
     - hash_and_equals
-    - iterable_contains_unrelated_type
-    - list_remove_unrelated_type
+    - collection_methods_unrelated_type
     - test_types_in_equals
     - unrelated_type_equality_checks
     - valid_regexps
diff --git a/kiwi_generator/lib/src/kiwi_injector_generator.dart b/kiwi_generator/lib/src/kiwi_injector_generator.dart
@@ -15,8 +15,8 @@ import 'package:kiwi/kiwi.dart';
 const TypeChecker _registerTypeChecker = TypeChecker.fromRuntime(Register);
 
 bool _isRegisterMethod(MethodElement method) =>
-    method.returnType.isVoid &&
-    _registerTypeChecker.hasAnnotationOfExact(method);
+    (method.returnType is VoidType &&
+        _registerTypeChecker.hasAnnotationOfExact(method));
 
 class KiwiInjectorGenerator extends Generator {
   const KiwiInjectorGenerator();
@@ -49,11 +49,11 @@ class KiwiInjectorGenerator extends Generator {
         rethrow;
       } else if (e is Error) {
         throw KiwiGeneratorError(
-            'Something went wrong with the KiwiGenerator. Please create a new ticket with a copy of your error to https://github.com/vanlooverenkoen/kiwi/issues/new?labels=kiwi_generator,bug',
+            'Something went wrong with the KiwiGenerator. Please create a new ticket with a copy of your error to https://github.com/gbtb16/kiwi/issues/new?labels=kiwi_generator,bug',
             error: e);
       } else {
         throw KiwiGeneratorError(
-            'Something went wrong with the KiwiGenerator. Please create a new ticket with a copy of your error to https://github.com/vanlooverenkoen/kiwi/issues/new?labels=kiwi_generator,bug');
+            'Something went wrong with the KiwiGenerator. Please create a new ticket with a copy of your error to https://github.com/gbtb16/kiwi/issues/new?labels=kiwi_generator,bug');
       }
     }
   }

diff --git a/kiwi_generator/pubspec.yaml b/kiwi_generator/pubspec.yaml
@@ -1,10 +1,10 @@
 name: kiwi_generator
 description: Generates dependency injection code using the kiwi package to reduce development time.
 version: 4.1.0
-homepage: https://github.com/vanlooverenkoen/kiwi/tree/master/kiwi_generator
+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/tool/actions/pubspec.yaml b/tool/actions/pubspec.yaml
@@ -1,10 +1,10 @@
 name: actions_tools
 description: A sample command-line application as an example for kiwi.
 version: 0.1.0
-homepage: https://github.com/vanlooverenkoen/kiwi
+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