Upgrade to asciidoctor-gradle-plugin 4.0.4

mrotteveel · mrotteveel · commit 9c949e0ab4d3 · 2024-12-21T16:43:48.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -30,8 +30,7 @@ pdfThemes {
 }
 
 asciidoctorj {
-    // asciidoctorj 3.0.0 doesn't seem to work with asciidoctor-gradle-plugin 4.0.3
-    version = '2.5.13'
+    version = '3.0.0'
     
     docExtensions file('doc-extension.groovy')
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -51,8 +51,8 @@ dependencies {
     compileOnly gradleApi()
     compileOnly localGroovy()
 
-    implementation 'org.asciidoctor.jvm.base:org.asciidoctor.jvm.base.gradle.plugin:4.0.3'
-    implementation 'org.asciidoctor.jvm.pdf:org.asciidoctor.jvm.pdf.gradle.plugin:4.0.3'
+    implementation 'org.asciidoctor.jvm.base:org.asciidoctor.jvm.base.gradle.plugin:4.0.4'
+    implementation 'org.asciidoctor.jvm.pdf:org.asciidoctor.jvm.pdf.gradle.plugin:4.0.4'
 
     implementation 'xerces:xercesImpl:2.12.2'
     implementation 'xml-resolver:xml-resolver:1.2'
diff --git a/doc-extension.groovy b/doc-extension.groovy
@@ -1,6 +1,6 @@
 docinfo_processor {
     document -> {
-        if (!document.basebackend('html') || !document.hasAttribute('fb-canonical-html')) {
+        if (!document.isBasebackend('html') || !document.hasAttribute('fb-canonical-html')) {
             return
         }
         return "<link rel=\"canonical\" href=\"${document.getAttribute('fb-canonical-html')}\"/>"

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ pdfThemes {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`asciidoctorj {`
`33`		`- // asciidoctorj 3.0.0 doesn't seem to work with asciidoctor-gradle-plugin 4.0.3`
`34`		`- version = '2.5.13'`
	`33`	`+ version = '3.0.0'`
`35`	`34`
`36`	`35`	`docExtensions file('doc-extension.groovy')`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`docinfo_processor {`
`2`	`2`	`document -> {`
`3`		`- if (!document.basebackend('html') \|\| !document.hasAttribute('fb-canonical-html')) {`
	`3`	`+ if (!document.isBasebackend('html') \|\| !document.hasAttribute('fb-canonical-html')) {`
`4`	`4`	`return`
`5`	`5`	`}`
`6`	`6`	`return "<link rel=\"canonical\" href=\"${document.getAttribute('fb-canonical-html')}\"/>"`