doc: use the new Sphinx Javadoc extension

Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
Signed-off-by: manticore-projects <andreas@manticore-projects.com>

Author: manticore-projects

.github/workflows/ci.yml

@@ -86,7 +86,7 @@ jobs:
         run: sudo apt-get install -y xsltproc sphinx-common
 
       - name: Install Python dependencies
-        run: pip install manticore_sphinx_theme myst_parser sphinx_substitution_extensions sphinx_issues sphinx_inline_tabs pygments
+        run: pip install manticore_sphinx_theme sphinx_javadoc_xml myst_parser sphinx_substitution_extensions sphinx_issues sphinx_inline_tabs pygments
 
       - name: Build Sphinx documentation with Gradle
         run: FLOATING_TOC=false ./gradlew -DFLOATING_TOC=false gitChangelogTask renderRR xslt xmldoc sphinx

.gitignore

@@ -8,10 +8,10 @@
 
 # Exclude the Auto-generated Changelog
 /src/site/sphinx/changelog.rst
-/src/site/sphinx/javadoc_stable.rst
 /src/site/sphinx/syntax_stable.rst
-/src/site/sphinx/javadoc_snapshot.rst
 /src/site/sphinx/syntax_snapshot.rst
+/src/site/sphinx/javadoc_stable.xml
+/src/site/sphinx/javadoc_snapshot.xml
 
 # Generated by javacc-maven-plugin
 /bin

build.gradle

@@ -249,12 +249,6 @@ tasks.register('xmldoc', Javadoc) {
                     : "xmlDoclet/javadoc_stable.xml"
     )
 
-    def rstFile =  reporting.file(
-            version.endsWith("-SNAPSHOT")
-                    ? "xmlDoclet/javadoc_snapshot.rst"
-                    : "xmlDoclet/javadoc_stable.rst"
-    )
-
     source = sourceSets.main.allJava
     // add any generated Java sources
     source += fileTree(layout.buildDirectory.dir("generated/javacc").get().asFile) {
@@ -271,16 +265,12 @@ tasks.register('xmldoc', Javadoc) {
     options.doclet = "com.manticore.tools.xmldoclet.XmlDoclet"
     title = "API $version"
 
-    options.addBooleanOption("rst", true)
-    if (Boolean.parseBoolean(System.getProperty("FLOATING_TOC", "true"))) {
-        options.addBooleanOption("withFloatingToc", true)
-    }
     options.addStringOption("basePackage", "net.sf.jsqlparser")
     options.addStringOption("filename", outFile.getName())
 
     doLast {
         copy {
-            from rstFile
+            from outFile
             into layout.projectDirectory.dir("src/site/sphinx/").asFile
         }
     }

src/site/sphinx/conf.py

@@ -16,6 +16,7 @@
     "sphinx_substitution_extensions",
     "sphinx_inline_tabs",
     "pygments.sphinxext",
+    "sphinx_javadoc_xml",
 ]