upgrade to new asciidoc plugins

open-jumpco · Sep 7, 2019 · f9d77b3 · f9d77b3
1 parent 38d9de2
commit f9d77b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'org.jetbrains.dokka' version '0.9.18'
     id 'maven-publish'
     id 'signing'
-    id 'org.asciidoctor.convert' version '2.3.0'
+    id 'org.asciidoctor.jvm.convert' version '2.3.0'
     id 'org.jlleitschuh.gradle.ktlint' version '8.2.0'
     id 'org.jlleitschuh.gradle.ktlint-idea' version '8.2.0'
     id 'com.cosminpolifronie.gradle.plantuml' version '1.6.0'

diff --git a/gradle/docs.gradle b/gradle/docs.gradle
@@ -8,7 +8,7 @@
  */
 
 apply plugin: 'org.jetbrains.dokka'
-apply plugin: 'org.asciidoctor.convert'
+apply plugin: 'org.asciidoctor.jvm.convert'
 
 dokka {
     outputFormat = 'html'
@@ -54,9 +54,11 @@ dokka {
 }
 
 asciidoctor {
+    baseDirFollowsSourceDir()
     logDocuments = true
-    inputs.files(fileTree('src/docs/asciidoc/*'))
-    requires ['asciidoctor-prism-extension']
+    asciidoctorj {
+        fatalWarnings missingIncludes()
+    }
 
     sources {
         include 'index.adoc'
@@ -70,16 +72,16 @@ asciidoctor {
             include '**/*.css'
         }
     }
+
     attributes toc: 'left',
         'source-highlighter': 'prism',
         idprefix: '',
         idseparator: '-',
         docinfo1: ''
-}
 
-//asciidoctorj {
-//    failOnWarnings true
-//}
+    requires ['asciidoctor-prism-extension']
+
+}
 
 task docs(type: Zip, dependsOn: [asciidoctor, dokka]) {
     archiveBaseName = project.name