gradle plugin

Author: SentryMan

inject-gradle-plugin/build.gradle

@@ -6,15 +6,15 @@ plugins {
 }
 
 group 'io.avaje.inject'
-version '11.1'
+version '11.6-RC4'
 
 repositories {
   mavenLocal()
   mavenCentral()
 }
 
 dependencies {
-  implementation 'io.avaje:avaje-inject:11.1'
+  implementation 'io.avaje:avaje-inject:11.6-RC4'
   implementation gradleApi()
 
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'

inject-gradle-plugin/src/main/java/io/avaje/inject/plugin/AvajeInjectPlugin.java

@@ -78,7 +78,7 @@ private void writeProvidedPlugins(ClassLoader classLoader, FileWriter pluginWrit
         provides.add(provide);
       }
       for (final var provide : plugin.providesAspectBeans()) {
-        provides.add(wrapAspect(provide.getCanonicalName()));
+        provides.add(wrapAspect(provide));
       }
       pluginEntries.put(typeName, provides);
     }
@@ -133,20 +133,11 @@ private void writeModuleCSV(ClassLoader classLoader, FileWriter moduleWriter) th
         var type = provide;
         provides.add(type);
       }
-      for (final var provide : module.autoProvidesBeans()) {
-        var type = provide;
-        provides.add(type);
-      }
-      for (final var provide : module.autoprovidesAspectBeans()) {
-        var type = wrapAspect(provide);
-        provides.add(type);
-      }
 
       final var requires = Arrays.stream(module.requiresBeans()).collect(toList());
-
-      Arrays.stream(module.autoRequires()).forEach(requires::add);
-      Arrays.stream(module.requiresPackages()).forEach(requires::add);
+      Collections.addAll(requires, module.requiresPackagesFromType());
       Arrays.stream(module.autoRequiresAspects())
+          .map(Class::getTypeName)
           .map(AvajeInjectPlugin::wrapAspect)
           .forEach(requires::add);
       modules.add(new ModuleData(name, provides, requires));