From 89791c63a9a0864f91f01deb1c9bd91bffbaa6d4 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 19 Jul 2024 12:09:35 -0400 Subject: [PATCH] Fix documentation generation After migration to the `io.spring.asciidoctor.backends:spring-asciidoctor-backends`, we missed to fix configuration for the respective `asciidoctor` Gradle tasks --- build.gradle | 1 - gradle/docs.gradle | 39 ++++++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 7fe7c6e40b..bdce39b60e 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,6 @@ plugins { id 'com.jfrog.artifactory' version '5.1.10' apply false id 'org.jetbrains.dokka' version '1.5.30' id 'org.asciidoctor.jvm.pdf' version '3.3.2' - id 'org.asciidoctor.jvm.gems' version '3.3.2' id 'org.asciidoctor.jvm.convert' version '3.3.2' } diff --git a/gradle/docs.gradle b/gradle/docs.gradle index 53a7f7a6be..24d1f57a64 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -54,7 +54,7 @@ asciidoctorPdf { configurations 'asciidoctorExtensions' asciidoctorj { - sourceDir "$buildDir/asciidoc" + sourceDir 'src/reference/asciidoc' inputs.dir(sourceDir) sources { include 'index-single.adoc' @@ -70,8 +70,27 @@ asciidoctorPdf { } } -asciidoctorj { - version = '2.5.2' +asciidoctor { + dependsOn asciidoctorPdf + + inProcess = JAVA_EXEC + forkOptions { + jvmArgs '--add-opens', 'java.base/sun.nio.ch=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED' + } + + baseDirFollowsSourceFile() + + configurations 'asciidoctorExtensions' + sourceDir "src/reference/asciidoc" + outputOptions { + backends 'spring-html' + } + resources { + from(sourceDir) { + include 'images/*', 'css/**', 'js/**' + } + } + options doctype: 'book', eruby: 'erubis' attributes 'docinfo': 'shared', stylesdir: 'css/', @@ -92,20 +111,6 @@ asciidoctorj { 'project-version': project.version } -asciidoctor { - dependsOn asciidoctorPdf - baseDirFollowsSourceFile() - configurations 'asciidoctorExtensions' - sourceDir "$buildDir/asciidoc" - inputs.dir(sourceDir) - resources { - from(sourceDir) { - include 'images/*', 'css/**', 'js/**' - } - } - -} - task reference(dependsOn: asciidoctor) { group = 'Documentation' description = 'Generate the reference documentation'