Merge pull request #744 from asciidoctor/development-4.x

Prepare 4.0.4 release
asciidoctor · Dec 19, 2024 · d0a9c79 · d0a9c79
2 parents dc28c9b + 797c9a2
commit d0a9c79
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/...c/main/groovy/org/asciidoctor/gradle/editorconfig/AsciidoctorEditorConfigGenerator.groovy b/...c/main/groovy/org/asciidoctor/gradle/editorconfig/AsciidoctorEditorConfigGenerator.groovy
@@ -55,6 +55,9 @@ class AsciidoctorEditorConfigGenerator extends DefaultTask {
     private Object outputDir
 
     AsciidoctorEditorConfigGenerator() {
+        notCompatibleWithConfigurationCache(
+                'Asciidoctor Gradle 4.x is not compatible with CC. Wait for the 5.x release'
+        )
         this.projectOperations = ProjectOperations.find(project)
         this.outputDir = project.projectDir
         this.outputFile = project.provider({

diff --git a/base/src/main/groovy/org/asciidoctor/gradle/base/AbstractAsciidoctorBaseTask.groovy b/base/src/main/groovy/org/asciidoctor/gradle/base/AbstractAsciidoctorBaseTask.groovy
@@ -665,6 +665,9 @@ abstract class AbstractAsciidoctorBaseTask extends DefaultTask implements Asciid
     @SuppressWarnings('ThisReferenceEscapesConstructor')
     protected AbstractAsciidoctorBaseTask() {
         super()
+        notCompatibleWithConfigurationCache(
+                'Asciidoctor Gradle 4.x is not compatible with CC. Wait for the 5.x release'
+        )
         this.projectOperations = ProjectOperations.find(project)
         this.intermediateArtifactPattern = project.objects.property(PatternSet)
         this.srcDir = createDirectoryProperty(project)

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version = 4.0.3
+version = 4.0.
 group = org.asciidoctor
 
 copyrightYear       = 2013-2024

diff --git a/jvm/src/intTest/groovy/org/asciidoctor/gradle/jvm/AsciidoctorTaskFunctionalSpec.groovy b/jvm/src/intTest/groovy/org/asciidoctor/gradle/jvm/AsciidoctorTaskFunctionalSpec.groovy
@@ -175,7 +175,7 @@ class AsciidoctorTaskFunctionalSpec extends FunctionalSpecification {
         String sample2 = new File(buildDir, 'docs/asciidoc/subdir/sample2.html').text
 
         then:
-        sample2.contains('gradle-relative-srcdir = [..]')
+        sample2.contains('gradle-relative-srcdir = [subdir]')
     }
 
     @Issue('https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/2324')

diff --git a/jvm/src/main/groovy/org/asciidoctor/gradle/remote/AsciidoctorJSetup.groovy b/jvm/src/main/groovy/org/asciidoctor/gradle/remote/AsciidoctorJSetup.groovy
@@ -58,7 +58,7 @@ class AsciidoctorJSetup implements Serializable {
      * @param runConfiguration The current executor configuration
      * @return Asciidoctor options
      */
-    @SuppressWarnings('DuplicateStringLiteral ')
+    @SuppressWarnings('UnnecessaryObjectReferences')
     Options normalisedOptionsFor(final File file, ExecutorConfiguration runConfiguration) {
         OptionsBuilder optionsBuilder = Options.builder()