injectable 2.4.3 ready

Milad-Akarie · Jul 21, 2024 · 1981cfc · 1981cfc
1 parent baee811
commit 1981cfc
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 78 deletions.
diff --git a/injectable/CHANGELOG.md b/injectable/CHANGELOG.md
@@ -1,4 +1,7 @@
 # ChangeLog
+## [2.4.3]
+- Feat: Improve Code Generation consistency using hash in alias imports
+- Fix: Fix @preResolve only works for methods warning
 ## [2.4.2]
 chore: unpin meta version
 ## [2.4.1]

diff --git a/injectable/example/lib/injector/injector.config.dart b/injectable/example/lib/injector/injector.config.dart
diff --git a/injectable/lib/src/injectable_annotations.dart b/injectable/lib/src/injectable_annotations.dart
@@ -325,7 +325,7 @@ const module = Module._();
 /// Futures annotated with [preResolve]
 /// will be pre-awaited before they're
 /// registered inside of GetIt
-@Target({TargetKind.method})
+@Target({TargetKind.method, TargetKind.getter, TargetKind.classType})
 class PreResolve {
   const PreResolve._();
 }

diff --git a/injectable/pubspec.lock b/injectable/pubspec.lock
@@ -29,17 +29,17 @@ packages:
     dependency: "direct dev"
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
   meta:
     dependency: "direct main"
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.15.0"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
+  dart: ">=3.1.0 <4.0.0"
diff --git a/injectable/pubspec.yaml b/injectable/pubspec.yaml
@@ -1,14 +1,14 @@
 name: injectable
 description: Injectable is a convenient code generator for get_it. Inspired by Angular DI, Guice DI and inject.dart.
-version: 2.4.2
+version: 2.4.3
 homepage: https://github.com/Milad-Akarie/injectable
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
   get_it: ">=7.2.0 <8.0.0"
-  meta: ^1.11.0
+  meta: ^1.12.0
 
 dev_dependencies:
-  lints: ^3.0.0
+  lints: ^4.0.0
diff --git a/injectable_generator/CHANGELOG.md b/injectable_generator/CHANGELOG.md
@@ -1,4 +1,7 @@
 # ChangeLog
+## [2.6.2]
+- Feat: Improve Code Generation consistency using hash in alias imports
+- Fix: Fix @preResolve only works for methods warning
 ## [2.6.1]
 Fix: make register order more predictable to avoid unnecessary code churns in source control by @Adam-Langley
 ## [2.6.0]

diff --git a/injectable_generator/lib/generators/injectable_config_generator.dart b/injectable_generator/lib/generators/injectable_config_generator.dart
@@ -330,7 +330,7 @@ class _HashedAllocator implements Allocator {
     return '_i${_imports.putIfAbsent(_url!, _hashedUrl)}.$symbol';
   }
 
-  int _hashedUrl() => _url.hashCode;
+  int _hashedUrl() => _url.hashCode / 1000000 ~/ 1;
 
   @override
   Iterable<Directive> get imports => _imports.keys.map(

diff --git a/injectable_generator/pubspec.lock b/injectable_generator/pubspec.lock
@@ -69,18 +69,18 @@ packages:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20"
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.4.2"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b"
+      sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.4.11"
   build_runner_core:
     dependency: transitive
     description:
@@ -93,10 +93,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_test
-      sha256: "927ef98b58c5603ec58923c0bb943a74743e58149732665885bb1eb92983befe"
+      sha256: "260dbba934f41b0a42935e9cae1f5731b94f0c3e489dc97bcf8e281265aaa5ae"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.2.2"
   built_collection:
     dependency: transitive
     description:
@@ -173,10 +173,10 @@ packages:
     dependency: "direct main"
     description:
       name: dart_style
-      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
+      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.6"
   file:
     dependency: transitive
     description:
@@ -255,7 +255,7 @@ packages:
       path: "../injectable"
       relative: true
     source: path
-    version: "2.4.1"
+    version: "2.4.3"
   io:
     dependency: transitive
     description:
@@ -284,10 +284,10 @@ packages:
     dependency: "direct dev"
     description:
       name: lints
-      sha256: "6b0206b0bf4f04961fc5438198ccb3a885685cd67d4d4a32cc20ad7f8adbe015"
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "4.0.0"
   logging:
     dependency: transitive
     description:
@@ -300,18 +300,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   meta:
     dependency: "direct main"
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
@@ -340,10 +340,10 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   pool:
     dependency: transitive
     description:
@@ -412,10 +412,10 @@ packages:
     dependency: "direct main"
     description:
       name: source_gen
-      sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16
+      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   source_map_stack_trace:
     dependency: transitive
     description:
@@ -484,26 +484,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: b9a384c4b9c4966dbf7215e7c033a78db1da7e5dcaf8da9232c5f24735f65652
+      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.24.5"
+    version: "1.25.8"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.3"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: c6a536288535efef8526eea8adfa4e25fdd2849fa7f457ecb2a52099998ce8f7
+      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.5"
+    version: "0.6.5"
   timing:
     dependency: transitive
     description:
@@ -561,4 +561,4 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
diff --git a/injectable_generator/pubspec.yaml b/injectable_generator/pubspec.yaml
@@ -1,27 +1,26 @@
 name: injectable_generator
 description: Injectable is a convenient code generator for get_it. Inspired by Angular DI, Guice DI and inject.dart.
-version: 2.6.1
+version: 2.6.2
 homepage: https://github.com/Milad-Akarie/injectable
 
 environment:
   sdk: ">=3.0.0<4.0.0"
 
 dependencies:
-  build: ^2.1.0
-  source_gen: ^1.2.7
-  path: ^1.8.0
-  glob: ^2.0.1
+  build: ^2.4.1
+  source_gen: ^1.5.0
+  path: ^1.9.0
+  glob: ^2.1.2
   analyzer: ">=6.4.1 <7.0.0"
   code_builder: ^4.10.0
-  dart_style: ^2.0.3
-  injectable:
-    ^2.4.0
+  dart_style: ^2.3.6
+  injectable: ^2.4.3
 #    path: ../injectable
   collection: ^1.17.1
   recase: ^4.1.0
-  meta: ^1.9.1
+  meta: ^1.12.0
 dev_dependencies:
-  build_runner: ^2.3.3
-  build_test: ^2.1.3
-  test: ^1.17.12
-  lints: ^2.0.0
+  build_runner: ^2.4.11
+  build_test: ^2.2.2
+  test: ^1.25.8
+  lints: ^4.0.0