Twist asciidoctor's arm into using asciidoctor-tabs (and sadly downgr…

…ade Gradle to 8.6 because asciidoctor/asciidoctor-gradle-plugin#725.
argo-json · Apr 3, 2024 · 2467fbe · 2467fbe
1 parent 6fa3d3c
commit 2467fbe
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -40,6 +40,7 @@ plugins {
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
     id("com.gitlab.svg2ico") version "1.4"
     id("org.asciidoctor.jvm.convert") version "4.0.2"
+    id("org.asciidoctor.jvm.gems") version "4.0.2"
 
     id("release.sourceforge")
 }
@@ -49,6 +50,9 @@ description = "Argo is an open source JSON parser and generator written in Java.
 
 repositories {
     mavenCentral()
+    ruby {
+        gems()
+    }
 }
 
 sourceSets {
@@ -71,6 +75,8 @@ dependencies {
 
     spotbugs(group = "com.github.spotbugs", name = "spotbugs", version = "4.8.3")
 
+    asciidoctorGems(group = "rubygems", name="asciidoctor-tabs", version="1.0.0.beta.6")
+
     jmhImplementation(testFixtures(project))
 }
 
@@ -241,13 +247,19 @@ tasks {
     }
 
     asciidoctor {
-        dependsOn(ico, png, javadoc) // doesn't seem to infer dependencies properly from the resources CopySpec
+        dependsOn(ico, png, javadoc, "asciidoctorGemsPrepare") // doesn't seem to infer dependencies properly from the resources CopySpec
         resources {
             from(ico, png)
             from(javadoc) {
                 into("javadoc")
             }
         }
+        asciidoctorj {
+            requires(
+                "asciidoctor",
+                project.layout.buildDirectory.file(".asciidoctorGems/gems/asciidoctor-tabs-1.0.0.beta.6/lib/asciidoctor-tabs.rb").get().asFile // TODO this is a workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/718
+            )
+        }
     }
 
     val documentationTar by registering(Tar::class) {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,7 +10,7 @@
 
 plugins {
     `kotlin-dsl`
-    kotlin("jvm") version "1.9.22"
+    kotlin("jvm") version "1.9.20"
 }
 
 repositories {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME