aspectj: fix deprecation warnings

freefair · Aug 28, 2023 · 4096e9e · 4096e9e
1 parent b84c666
commit 4096e9e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 45 deletions.
diff --git a/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPlugin.java b/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPlugin.java
@@ -44,17 +44,17 @@ public void apply(Project project) {
         project.getPlugins().apply(AspectJBasePlugin.class);
         project.getPlugins().apply(JavaBasePlugin.class);
 
-        JavaPluginExtension plugin = project.getExtensions().getByType(JavaPluginExtension.class);
+        JavaPluginExtension javaExtension = project.getExtensions().getByType(JavaPluginExtension.class);
 
         JavaToolchainService service = project.getExtensions().getByType(JavaToolchainService.class);
-        defaultLauncher = service.launcherFor(plugin.getToolchain());
+        defaultLauncher = service.launcherFor(javaExtension.getToolchain());
 
-        plugin.getSourceSets().all(this::configureSourceSet);
+        javaExtension.getSourceSets().all(this::configureSourceSet);
 
         project.getPlugins().withType(JavaPlugin.class, javaPlugin -> {
 
-            SourceSet main = plugin.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-            SourceSet test = plugin.getSourceSets().getByName(SourceSet.TEST_SOURCE_SET_NAME);
+            SourceSet main = javaExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+            SourceSet test = javaExtension.getSourceSets().getByName(SourceSet.TEST_SOURCE_SET_NAME);
 
             Configuration aspectpath = project.getConfigurations().getByName(WeavingSourceSet.getAspectConfigurationName(main));
             Configuration testAspectpath = project.getConfigurations().getByName(WeavingSourceSet.getAspectConfigurationName(test));
@@ -66,6 +66,9 @@ public void apply(Project project) {
     }
 
     private void configureSourceSet(SourceSet sourceSet) {
+        sourceSet.getExtensions().add(WeavingSourceSet.IN_PATH_EXTENSION_NAME, project.getObjects().fileCollection());
+        sourceSet.getExtensions().add(WeavingSourceSet.ASPECT_PATH_EXTENSION_NAME, project.getObjects().fileCollection());
+
         DefaultAspectjSourceSet aspectjSourceSet = new DefaultAspectjSourceSet(project.getObjects(), sourceSet);
         new DslObject(sourceSet).getConvention().getPlugins().put("aspectj", aspectjSourceSet);
 

diff --git a/...gin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPostCompileWeavingPlugin.java b/...gin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPostCompileWeavingPlugin.java
@@ -1,13 +1,11 @@
 package io.freefair.gradle.plugins.aspectj;
 
-import io.freefair.gradle.plugins.aspectj.internal.DefaultWeavingSourceSet;
 import org.gradle.api.NonNullApi;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.internal.plugins.DslObject;
 import org.gradle.api.internal.tasks.compile.HasCompileOptions;
 import org.gradle.api.plugins.GroovyPlugin;
 import org.gradle.api.plugins.JavaBasePlugin;
@@ -62,8 +60,8 @@ public void apply(Project project) {
     }
 
     private void configureSourceSetDefaults(SourceSet sourceSet) {
-        DefaultWeavingSourceSet weavingSourceSet = new DefaultWeavingSourceSet(sourceSet, project.getObjects());
-        new DslObject(sourceSet).getConvention().add("aspectj", weavingSourceSet);
+        sourceSet.getExtensions().add(WeavingSourceSet.IN_PATH_EXTENSION_NAME, project.getObjects().fileCollection());
+        sourceSet.getExtensions().add(WeavingSourceSet.ASPECT_PATH_EXTENSION_NAME, project.getObjects().fileCollection());
 
         Configuration aspectpath = project.getConfigurations().create(WeavingSourceSet.getAspectConfigurationName(sourceSet));
         WeavingSourceSet.getAspectPath(sourceSet).from(aspectpath);

diff --git a/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectjSourceSet.java b/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectjSourceSet.java
@@ -1,12 +1,7 @@
 package io.freefair.gradle.plugins.aspectj;
 
-import groovy.lang.Closure;
-import org.gradle.api.Action;
-import org.gradle.api.file.SourceDirectorySet;
 import org.gradle.api.tasks.SourceSet;
 
-import javax.annotation.Nullable;
-
 /**
  * @see org.gradle.api.tasks.GroovySourceSet
  * @see org.gradle.api.tasks.ScalaSourceSet

diff --git a/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/WeavingSourceSet.java b/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/WeavingSourceSet.java
@@ -1,7 +1,6 @@
 package io.freefair.gradle.plugins.aspectj;
 
 import org.gradle.api.file.ConfigurableFileCollection;
-import org.gradle.api.file.FileCollection;
 import org.gradle.api.tasks.SourceSet;
 
 public interface WeavingSourceSet {

diff --git a/...in/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultAspectjSourceSet.java b/...in/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultAspectjSourceSet.java
@@ -14,11 +14,9 @@
  * @see org.gradle.api.internal.tasks.DefaultGroovySourceSet
  */
 @Getter
-public class DefaultAspectjSourceSet extends DefaultWeavingSourceSet implements AspectjSourceSet, HasPublicType {
+public class DefaultAspectjSourceSet implements AspectjSourceSet, HasPublicType {
 
     public DefaultAspectjSourceSet(ObjectFactory objectFactory, SourceSet sourceSet) {
-        super(sourceSet, objectFactory);
-
         String name = sourceSet.getName();
         String displayName = ((DefaultSourceSet) sourceSet).getDisplayName();
 

diff --git a/...in/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultWeavingSourceSet.java b/...in/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultWeavingSourceSet.java