Adjusting build.gradle and docs-config.gradle to make asciidoc build

Author: sbglasius

build.gradle

@@ -2,13 +2,9 @@ import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
-plugins {
-    id "com.adarshr.test-logger" version "4.0.0"
-    id "maven-publish"
-    id 'org.asciidoctor.jvm.convert'
-    id 'org.apache.grails.gradle.grails-plugin'
-    id 'org.apache.grails.gradle.grails-publish'
-}
+apply plugin: 'groovy'
+apply plugin: 'org.apache.grails.gradle.grails-plugin'
+apply plugin: 'org.apache.grails.gradle.grails-publish'
 
 group "org.grails.plugins"
 
@@ -44,23 +40,7 @@ dependencies {
 java {
     withSourcesJar()
     withJavadocJar()
-    sourceCompatibility = JavaVersion.toVersion("17")
-}
-
-asciidoctor {
-    baseDir file('src/main/asciidoc')
-    sourceDir file('src/main/asciidoc')
-    outputDir project.layout.buildDirectory.file("docs")
-    options doctype: 'book'
-    attributes 'source-highlighter': 'coderay',
-            toc: 'left',
-            toclevels: '2',
-            'toc-title': 'Table of Contents',
-            icons: 'font',
-            id: project.name + ':' + project.version,
-            idprefix: '',
-            idseparator: '-',
-            version: version
+    sourceCompatibility = JavaVersion.toVersion(javaVersion)
 }
 
 tasks.withType(Test).configureEach {
@@ -69,9 +49,6 @@ tasks.withType(Test).configureEach {
         events "failed"
         exceptionFormat "full"
     }
-    testlogger {
-        theme 'mocha'
-    }
 }
 groovydoc {
     excludes = ['**/*GrailsPlugin.groovy', '**/Application.groovy']
@@ -83,7 +60,6 @@ groovydoc {
     link('http://gorm.grails.org/latest/hibernate/api/', 'grails.gorm', 'grails.orm', 'org.grails.datastore', 'org.grails.orm')
 }
 
-
 grailsPublish {
     githubSlug = 'grails-plugins/i18n-enums'
     license {
@@ -98,3 +74,7 @@ grailsPublish {
             bkoehm      : 'Brian Koehmstedt'
     ]
 }
+
+compileJava.options.release = javaVersion.toInteger()
+
+apply from: layout.projectDirectory.file('gradle/docs-config.gradle')

gradle/docs-config.gradle

@@ -29,20 +29,20 @@ tasks.withType(AsciidoctorTask).configureEach {
         doctype              : 'book',
         encoding             : 'utf-8',
         icons                : 'font',
-        id                   : "$rootProject.name:$projectVersion",
+        id                   : "$rootProject.name:$version",
         idprefix             : '',
         idseparator          : '-',
         lang                 : 'en',
         linkattrs            : true,
         numbered             : '',
         producer             : 'Asciidoctor',
-        revnumber            : projectVersion,
+        revnumber            : version,
         setanchors           : true,
         'source-highlighter' : 'prettify',
         toc                  : 'left',
         toc2                 : '',
         toclevels            : '2',
-        projectVersion       : projectVersion
+        projectVersion       : version
     ]
 }