Update asciidoc-extension to Asciidoctor 3.0.0

However, we need to wait until the plugin itself supports 3.0.0 before we can merge this.
leonard84 · Dec 19, 2024 · 00ccb5b · 00ccb5b
1 parent f5f2e11
commit 00ccb5b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.../src/main/java/org/spockframework/plugins/asciidoctor/SpockIssueInlineMacroProcessor.java b/.../src/main/java/org/spockframework/plugins/asciidoctor/SpockIssueInlineMacroProcessor.java
@@ -1,6 +1,8 @@
 package org.spockframework.plugins.asciidoctor;
 
 import org.asciidoctor.ast.ContentNode;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 import org.asciidoctor.extension.Name;
 
@@ -11,8 +13,7 @@
 public class SpockIssueInlineMacroProcessor extends InlineMacroProcessor {
 
   @Override
-  public Object process(
-    ContentNode parent, String target, Map<String, Object> attributes) {
+  public PhraseNode process(StructuralNode parent, String target, Map<String, Object> attributes) {
 
     String href = parent.getDocument().getAttribute("github-base") + "/issues/" + target;
 

diff --git a/...s/src/main/java/org/spockframework/plugins/asciidoctor/SpockPullInlineMacroProcessor.java b/...s/src/main/java/org/spockframework/plugins/asciidoctor/SpockPullInlineMacroProcessor.java
@@ -1,6 +1,8 @@
 package org.spockframework.plugins.asciidoctor;
 
 import org.asciidoctor.ast.ContentNode;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 import org.asciidoctor.extension.Name;
 
@@ -11,8 +13,7 @@
 public class SpockPullInlineMacroProcessor extends InlineMacroProcessor {
 
   @Override
-  public Object process(
-    ContentNode parent, String target, Map<String, Object> attributes) {
+  public PhraseNode process(StructuralNode parent, String target, Map<String, Object> attributes) {
 
     String href = parent.getDocument().getAttribute("github-base") + "/pull/" + target;
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-asciidoctorj = '2.5.13'
+asciidoctorj = '3.0.0'
 groovy2 = '2.5.23'
 groovy3 = '3.0.23'
 groovy4 = '4.0.24'