diff --git a/asciidoctoreditorconfig/src/main/groovy/org/asciidoctor/gradle/editorconfig/AsciidoctorEditorConfigGenerator.groovy b/asciidoctoreditorconfig/src/main/groovy/org/asciidoctor/gradle/editorconfig/AsciidoctorEditorConfigGenerator.groovy index a36f20911..9c755ac39 100644 --- a/asciidoctoreditorconfig/src/main/groovy/org/asciidoctor/gradle/editorconfig/AsciidoctorEditorConfigGenerator.groovy +++ b/asciidoctoreditorconfig/src/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 index 0839d1181..9c23b7136 100644 --- 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 index 3769e8275..034881eaa 100644 --- 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 index 198bb87ef..783c977b1 100644 --- 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 index a9179fe2e..858bf8d51 100644 --- 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()