freefair · Oct 8, 2023 · Oct 9, 2023 · Oct 9, 2023 · Oct 9, 2023 · Oct 9, 2023
diff --git a/.github/workflows/gradle-deploy.yml b/.github/workflows/gradle-deploy.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'

diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'temurin'

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/wrapper-validation-action@v2
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -16,18 +16,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 11, 17 ]
+        java: [ 8, 11, 17, 21 ]
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - run: ./gradlew -V assemble -s
       - run: ./gradlew -V uploadGithubDependenciesSnapshot -s
@@ -47,21 +47,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 11, 17 ]
+        java: [ 11, 17, 21 ]
     defaults:
       run:
         working-directory: examples
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - run: ./gradlew -V assemble -s
       - run: ./gradlew -V uploadGithubDependenciesSnapshot -s

diff --git a/README.md b/README.md
@@ -11,9 +11,18 @@ Javadoc https://docs.freefair.io/gradle-plugins/current/api/
 
 # Compatibility Matrix
 
+Since version 8, we align our major.minor version with Gradle.
+
+The plugins itself should work on every Java version on which Gradle works,
+but external tools like Lombok or Ajc may have additional constrains.
+
 | Plugin Version | Gradle Version | Java Version | Kotlin Version |
 |----------------|----------------|--------------|----------------|
-| 8.0.x          | 8.0            | 8 - 18       |                |
+| 8.4.x          | 8.4            | 8+           |                |
+| 8.3.x          | 8.3            | 8+           |                |
+| 8.2.x          | 8.2            | 8+           |                |
+| 8.1.x          | 8.1            | 8+           |                |
+| 8.0.x          | 8.0            | 8+           |                |
 | 6.6.x          | 7.6            | 8 - 18       | 1.7.x          |
 | 6.5.x          | 7.5            | 8 - 18       | 1.7.x          |
 | 6.4.x          | 7.4            | 8 - 17       | 1.3.x - 1.6.x  |

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
@@ -7,7 +7,6 @@
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.SourceDirectorySet;
 import org.gradle.api.internal.tasks.DefaultSourceSet;
-import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.plugins.internal.JvmPluginsHelper;
@@ -27,6 +26,8 @@ public class AspectJPlugin implements Plugin<Project> {
 
     private Provider<JavaLauncher> defaultLauncher;
 
+    private JavaPluginExtension javaExtension;
+
     @Override
     public void apply(Project project) {
         if (project.getPlugins().hasPlugin(AspectJPostCompileWeavingPlugin.class)) {
@@ -42,27 +43,32 @@ public void apply(Project project) {
 
         this.project = project;
         project.getPlugins().apply(AspectJBasePlugin.class);
-        project.getPlugins().apply(JavaBasePlugin.class);
+        project.getPlugins().apply(JavaPlugin.class);
+
+        configureJavaBasePlugin(project);
+
+        configureJavaPlugin(project);
+    }
 
-        JavaPluginExtension javaExtension = project.getExtensions().getByType(JavaPluginExtension.class);
+    private void configureJavaBasePlugin(Project project) {
+        javaExtension = project.getExtensions().getByType(JavaPluginExtension.class);
 
         JavaToolchainService service = project.getExtensions().getByType(JavaToolchainService.class);
         defaultLauncher = service.launcherFor(javaExtension.getToolchain());
 
         javaExtension.getSourceSets().all(this::configureSourceSet);
+    }
 
-        project.getPlugins().withType(JavaPlugin.class, javaPlugin -> {
-
-            SourceSet main = javaExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-            SourceSet test = javaExtension.getSourceSets().getByName(SourceSet.TEST_SOURCE_SET_NAME);
+    private void configureJavaPlugin(Project project) {
+        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));
+        Configuration aspectpath = project.getConfigurations().getByName(WeavingSourceSet.getAspectConfigurationName(main));
+        Configuration testAspectpath = project.getConfigurations().getByName(WeavingSourceSet.getAspectConfigurationName(test));
 
-            testAspectpath.extendsFrom(aspectpath);
+        testAspectpath.extendsFrom(aspectpath);
 
-            WeavingSourceSet.getAspectPath(test).setFrom(main.getOutput(), testAspectpath);
-        });
+        WeavingSourceSet.getAspectPath(test).setFrom(main.getOutput(), testAspectpath);
     }
 
     private void configureSourceSet(SourceSet sourceSet) {

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'io.freefair.lombok' apply false
     id "com.gradle.plugin-publish" version "1.2.1" apply false
     id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
-    id "org.owasp.dependencycheck" version "8.4.0"
+    id "org.owasp.dependencycheck" version "9.0.9"
     id 'org.jetbrains.kotlin.jvm' apply false
 }
 
@@ -45,12 +45,12 @@ allprojects {
         test.useJUnitPlatform()
 
         dependencies {
-            testImplementation platform("org.junit:junit-bom:5.10.0")
+            testImplementation platform("org.junit:junit-bom:5.10.2")
 
-            testImplementation 'org.assertj:assertj-core:3.24.2'
+            testImplementation 'org.assertj:assertj-core:3.25.3'
             testImplementation 'org.junit.jupiter:junit-jupiter-api'
             testImplementation 'org.junit.jupiter:junit-jupiter-params'
-            testImplementation 'org.mockito:mockito-core:5.5.0'
+            testImplementation 'org.mockito:mockito-core:5.10.0'
             testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
         }
 

diff --git a/code-generator-plugin/build.gradle b/code-generator-plugin/build.gradle
@@ -7,7 +7,7 @@ plugins {
 description = "A plugin for executing specified code generators"
 
 dependencies {
-    implementation 'io.github.classgraph:classgraph:4.8.162'
+    implementation 'io.github.classgraph:classgraph:4.8.165'
     api project(':code-generator-api')
     testImplementation project(':test-common')
 

diff --git a/compress-plugin/build.gradle b/compress-plugin/build.gradle
@@ -48,7 +48,7 @@ gradlePlugin {
 }
 
 dependencies {
-    api 'org.apache.commons:commons-compress:1.24.0'
+    api 'org.apache.commons:commons-compress:1.25.0'
     implementation 'org.tukaani:xz:1.9'
 
     implementation 'org.brotli:dec:0.1.2'

diff --git a/documentation/build.gradle b/documentation/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.asciidoctor.jvm.convert' version '3.3.2'
+    id 'org.asciidoctor.jvm.convert' version '4.0.2'
     id 'io.freefair.aggregate-javadoc'
     id 'io.freefair.javadoc-links'
 }
@@ -26,10 +26,10 @@ dependencies {
     }
 
     javadocClasspath "org.jacoco:org.jacoco.ant:${org.gradle.testing.jacoco.plugins.JacocoPlugin.DEFAULT_JACOCO_VERSION}"
-    javadocClasspath "org.apache.maven.plugins:maven-plugin-plugin:3.9.0"
-    javadocClasspath 'net.sourceforge.plantuml:plantuml:1.2023.11'
+    javadocClasspath "org.apache.maven.plugins:maven-plugin-plugin:3.11.0"
+    javadocClasspath 'net.sourceforge.plantuml:plantuml:1.2024.3'
 
-    asciidoctorExt "io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.6.2"
+    asciidoctorExt "io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.6.3"
 }
 
 tasks.register("docsZip", Zip) {

diff --git a/documentation/src/docs/asciidoc/_aspectj.adoc b/documentation/src/docs/asciidoc/_aspectj.adoc
@@ -65,14 +65,14 @@ This enables the usage of AspectJ in combination with annotation processors like
 .Groovy
 ----
 dependencies {
-    implementation "org.aspectj:aspectjrt:1.9.8.RC3"
+    implementation "org.aspectj:aspectjrt:1.9.21.1"
 }
 ----
 [source, kotlin, role="secondary"]
 .Kotlin
 ----
 dependencies {
-    implementation("org.aspectj:aspectjrt:1.9.8.RC3")
+    implementation("org.aspectj:aspectjrt:1.9.21.1")
 }
 ----
 --

diff --git a/documentation/src/docs/asciidoc/_embedded-sass.adoc b/documentation/src/docs/asciidoc/_embedded-sass.adoc
@@ -18,7 +18,7 @@ This plugin adds the `sass` extension to the project and applies it to all `Sass
 ----
 sass {
     omitSourceMapUrl = false
-    outputStyle = sass.embedded_protocol.EmbeddedSass.OutputStyle.EXPANDED
+    outputStyle = com.sass_lang.embedded_protocol.OutputStyle.EXPANDED
     sourceMapContents = false
     sourceMapEmbed = false
     sourceMapEnabled = true
@@ -29,7 +29,7 @@ sass {
 ----
 sass {
     omitSourceMapUrl = false
-    outputStyle = sass.embedded_protocol.EmbeddedSass.OutputStyle.EXPANDED
+    outputStyle = com.sass_lang.embedded_protocol.OutputStyle.EXPANDED
     sourceMapContents = false
     sourceMapEmbed = false
     sourceMapEnabled = true

diff --git a/documentation/src/docs/asciidoc/index.adoc b/documentation/src/docs/asciidoc/index.adoc
@@ -89,7 +89,15 @@ apply(plugin = "io.freefair.lombok")
 
 == System Requirements
 
-Unless otherwise noted, all plugins require at least Java 8 and are targeted at Gradle {gradle_version}.
+=== Gradle
+
+The plugins of version {revnumber} are targeted at Gradle {gradle_version}.
+
+Starting with version 8, the _Major.Minor_ version of the plugins matches those of Gradle itself.
+
+=== Java
+
+Most of the plugins should work all Java versions supported by Gradle {gradle_version}, but some of the included external tools or libraries like Lombok or AJC might have additional constraints.
 
 include::_settings.adoc[]
 

diff --git a/embedded-sass-plugin/build.gradle b/embedded-sass-plugin/build.gradle
@@ -40,8 +40,8 @@ gradlePlugin {
 }
 
 dependencies {
-    api 'de.larsgrefer.sass:sass-embedded-host:3.2.0'
-    implementation 'org.webjars:webjars-locator-core:0.53'
+    api 'de.larsgrefer.sass:sass-embedded-host:3.4.0'
+    implementation 'org.webjars:webjars-locator-core:0.55'
 
     testImplementation project(":test-common")
 }
diff --git a/embedded-sass-plugin/src/main/java/io/freefair/gradle/plugins/sass/SassCompile.java b/embedded-sass-plugin/src/main/java/io/freefair/gradle/plugins/sass/SassCompile.java
@@ -172,16 +172,16 @@ public void visitFile(@Nonnull FileVisitDetails fileVisitDetails) {
     @Optional
     public abstract ListProperty<CustomImporter> getCustomImporters();
 
-    @InputFiles
+    @Classpath
     @Optional
-    @PathSensitive(PathSensitivity.RELATIVE)
     public abstract ConfigurableFileCollection getWebjars();
 
     /**
      * SassList of paths.
      */
     @InputFiles
     @Optional
+    @IgnoreEmptyDirectories
     @PathSensitive(PathSensitivity.RELATIVE)
     public abstract ConfigurableFileCollection getIncludePaths();
 

diff --git a/embedded-sass-plugin/src/main/java/sass/embedded_protocol/EmbeddedSass/OutputStyle.java b/embedded-sass-plugin/src/main/java/sass/embedded_protocol/EmbeddedSass/OutputStyle.java
@@ -0,0 +1,30 @@
+package sass.embedded_protocol.EmbeddedSass;
+
+import lombok.experimental.UtilityClass;
+
+/**
+ * Delegate for the old OutputStyle FQN.
+ * <p>
+ * This should help builds to migrate to the new package.
+ *
+ * @author Lars Grefer
+ * @deprecated Migrate to {@link com.sass_lang.embedded_protocol.OutputStyle}
+ */
+@Deprecated
+@UtilityClass
+public final class OutputStyle {
+
+    /**
+     * @see com.sass_lang.embedded_protocol.OutputStyle#EXPANDED
+     * @deprecated Migrate to {@link com.sass_lang.embedded_protocol.OutputStyle#EXPANDED}
+     */
+    @Deprecated
+    public static final com.sass_lang.embedded_protocol.OutputStyle EXPANDED = com.sass_lang.embedded_protocol.OutputStyle.EXPANDED;
+
+    /**
+     * @see com.sass_lang.embedded_protocol.OutputStyle#COMPRESSED
+     * @deprecated Migrate to {@link com.sass_lang.embedded_protocol.OutputStyle#COMPRESSED}
+     */
+    @Deprecated
+    public static final com.sass_lang.embedded_protocol.OutputStyle COMPRESSED = com.sass_lang.embedded_protocol.OutputStyle.COMPRESSED;
+}
diff --git a/examples/aspectj/aspect/build.gradle b/examples/aspectj/aspect/build.gradle
@@ -1,9 +1,14 @@
-apply plugin: "java"
-apply plugin: "groovy"
 apply plugin: "io.freefair.aspectj"
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+    targetCompatibility = "11"
+}
+
 dependencies {
-    implementation "org.aspectj:aspectjrt:1.9.20.1"
+    implementation "org.aspectj:aspectjrt:1.9.21.1"
 }
 
 compileAspectj {

diff --git a/examples/aspectj/httpcore-nio/build.gradle b/examples/aspectj/httpcore-nio/build.gradle
@@ -1,9 +1,15 @@
 apply plugin: "java"
 apply plugin: "io.freefair.aspectj"
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 dependencies {
     inpath 'org.apache.httpcomponents:httpcore-nio:4.4.16'
-    implementation "org.aspectj:aspectjrt:1.9.20.1"
+    implementation "org.aspectj:aspectjrt:1.9.21.1"
 
     testImplementation 'junit:junit:4.13.2'
 }
diff --git a/examples/aspectj/test/build.gradle b/examples/aspectj/test/build.gradle
@@ -1,8 +1,14 @@
 apply plugin: "io.freefair.aspectj.post-compile-weaving"
 apply plugin: "java"
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 dependencies {
-    implementation "org.aspectj:aspectjrt:1.9.20.1"
+    implementation "org.aspectj:aspectjrt:1.9.21.1"
 
     testImplementation 'junit:junit:4.13.2'
 }