Update to asciidoctor-gradle-plugin 4.0.4 and asciidoctorj 3.0.0

mrotteveel · mrotteveel · commit e1fcc1a7b37c · 2024-12-21T16:27:27.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ plugins {
     id 'nu.studer.credentials' version '3.0'
     id 'maven-publish'
     id 'signing'
-    id 'org.asciidoctor.jvm.convert' version '4.0.3'
+    id 'org.asciidoctor.jvm.convert' version '4.0.4'
 }
 
 defaultTasks 'clean', 'build'
@@ -97,8 +97,7 @@ processResources {
 }
 
 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/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
`@@ -14,7 +14,7 @@ plugins {`
`14`	`14`	`id 'nu.studer.credentials' version '3.0'`
`15`	`15`	`id 'maven-publish'`
`16`	`16`	`id 'signing'`
`17`		`- id 'org.asciidoctor.jvm.convert' version '4.0.3'`
	`17`	`+ id 'org.asciidoctor.jvm.convert' version '4.0.4'`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`defaultTasks 'clean', 'build'`
`@@ -97,8 +97,7 @@ processResources {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`asciidoctorj {`
`100`		`- // asciidoctorj 3.0.0 doesn't seem to work with asciidoctor-gradle-plugin 4.0.3`
`101`		`- version = '2.5.13'`
	`100`	`+ version = '3.0.0'`
`102`	`101`
`103`	`102`	`docExtensions file('doc-extension.groovy')`
`104`	`103`	`}`
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')}\"/>"`