From 4096e9e8f3bd3a457237e42d2130d8cf53a4c407 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Mon, 28 Aug 2023 02:17:45 +0200 Subject: [PATCH] aspectj: fix deprecation warnings --- .../gradle/plugins/aspectj/AspectJPlugin.java | 13 +++++---- .../AspectJPostCompileWeavingPlugin.java | 6 ++--- .../plugins/aspectj/AspectjSourceSet.java | 5 ---- .../plugins/aspectj/WeavingSourceSet.java | 1 - .../internal/DefaultAspectjSourceSet.java | 4 +-- .../internal/DefaultWeavingSourceSet.java | 27 ------------------- 6 files changed, 11 insertions(+), 45 deletions(-) delete mode 100644 aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultWeavingSourceSet.java 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 index 0c805013..47de81ea 100644 --- 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/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPostCompileWeavingPlugin.java b/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPostCompileWeavingPlugin.java index e7bef837..87b1eabe 100644 --- a/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPostCompileWeavingPlugin.java +++ b/aspectj-plugin/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 index 7e34aea0..24b2eccf 100644 --- 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 index 8d8c59da..8bebd784 100644 --- 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/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultAspectjSourceSet.java b/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultAspectjSourceSet.java index 42433ef2..107a14b4 100644 --- a/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultAspectjSourceSet.java +++ b/aspectj-plugin/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/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultWeavingSourceSet.java b/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultWeavingSourceSet.java deleted file mode 100644 index de5f4921..00000000 --- a/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/internal/DefaultWeavingSourceSet.java +++ /dev/null @@ -1,27 +0,0 @@ -package io.freefair.gradle.plugins.aspectj.internal; - -import io.freefair.gradle.plugins.aspectj.WeavingSourceSet; -import lombok.Data; -import org.gradle.api.file.ConfigurableFileCollection; -import org.gradle.api.file.FileCollection; -import org.gradle.api.internal.plugins.DslObject; -import org.gradle.api.model.ObjectFactory; -import org.gradle.api.plugins.ExtensionContainer; -import org.gradle.api.reflect.HasPublicType; -import org.gradle.api.reflect.TypeOf; -import org.gradle.api.tasks.SourceSet; -import org.gradle.internal.deprecation.DeprecationLogger; - -@Data -public class DefaultWeavingSourceSet implements WeavingSourceSet, HasPublicType { - - public DefaultWeavingSourceSet(SourceSet sourceSet, ObjectFactory objectFactory) { - sourceSet.getExtensions().add("aspectPath", objectFactory.fileCollection()); - sourceSet.getExtensions().add("inPath", objectFactory.fileCollection()); - } - - @Override - public TypeOf getPublicType() { - return TypeOf.typeOf(WeavingSourceSet.class); - } -}