Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare 4.0.4 release #744

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Prepare 4.0.4 release #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
148b8a7
Bump the release to 4.0.4
ysb33r Dec 18, 2024
9e73da1
Indicate the Asciidoctor 4.x tasks are not compatible with CC
ysb33r Dec 18, 2024
797c9a2
fix: small code fixes
ysb33r Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...c/main/groovy/org/asciidoctor/gradle/editorconfig/AsciidoctorEditorConfigGenerator.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
3 changes: 3 additions & 0 deletions base/src/main/groovy/org/asciidoctor/gradle/base/AbstractAsciidoctorBaseTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 4.0.3
version = 4.0.
group = org.asciidoctor

copyrightYear = 2013-2024
Expand Down
2 changes: 1 addition & 1 deletion jvm/src/intTest/groovy/org/asciidoctor/gradle/jvm/AsciidoctorTaskFunctionalSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion jvm/src/main/groovy/org/asciidoctor/gradle/remote/AsciidoctorJSetup.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
Loading