Update Gradle wrapper to 6.3 and Asciidoctor to 3.3.2

.gitlab-ci.yml

@@ -12,10 +12,7 @@ Create Documentation:
   stage: build
   script: 
     - chmod +x docs/gradlew
-    - cd docs; ./gradlew asciidoctor
+    - cd docs; ./gradlew publish
-  artifacts:
-    paths:
-      - docs/build/asciidoc/pdf/kalorienmanager.pdf
 
 Compile Go Application:
   stage: build

docs/build.gradle

@@ -1,51 +1,74 @@
-buildscript {
+plugins {
-    repositories {
+    id 'org.asciidoctor.jvm.pdf' version '3.3.2'
-        jcenter()
+    id 'org.asciidoctor.jvm.convert' version '3.3.2'
-        maven {
+    id 'org.asciidoctor.jvm.gems' version '3.3.2'
-            url "https://plugins.gradle.org/m2/"
+    id 'maven-publish'
-        }
-    }
-    dependencies {
-        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.7'
-        //classpath 'org.asciidoctor:asciidoctorj-epub3:1.5.0-alpha.6'
-        classpath ('org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16') {
-            exclude group: 'org.jruby'
-        }
-        classpath 'org.jruby:jruby:9.1.17.0'
-    }
 }
 
-apply plugin: 'org.asciidoctor.convert'
+repositories {
+    jcenter()
+    ruby.gems()
+}
 
-version = '0.0.1-SNAPSHOT'
+dependencies {
-description = 'Kalorien Manager Application'
+    asciidoctorGems 'rubygems:rouge:3.15.0'
+    asciidoctorGems 'rubygems:asciidoctor-diagram:2.2.2'
+}
 
 final BUILD_DATE = new Date().format('dd.MM.yyyy').toString()
-
+def pdfFile = layout.buildDirectory.file("docs/asciidocPdf/" + project.name + ".pdf")
-asciidoctorj {
+def pdfArtifact = artifacts.add('archives', pdfFile.get().asFile) {
-    version = '1.6.0-alpha.7'
+    type 'pdf'
+    builtBy asciidoctorPdf
 }
 
-asciidoctor {
+publishing {
-    backends 'html5', 'pdf'
+    publications {
-    attributes 'build-gradle':       file('build.gradle'),
+        maven(MavenPublication) {
-               'source-highlighter': 'coderay',
+            artifactId = project.name
-               'toc':                'left',
+            artifact pdfArtifact
-               'toc-title':          'Inhaltsverzeichnis',
+        }
-               'revdate':            BUILD_DATE,
+    }
-               'revnumber':          version,
+    repositories {
-               'idprefix':           'id_',
+        maven {
-               'chapter-label':      '',
+            url "https://gitlab.thpeetz.de/api/v4/projects/${projectId}/packages/maven"
-               'icons':              'font',
+            credentials(HttpHeaderCredentials) {
-               'setanchors':         '',
+                name = "Private-Token"
-               'idseparator':        '-',
+                value = gitLabPrivateToken
-               'endpoint-url':       'http://www.thpeetz.de',
+            }
-               'imagesdir':          './images',
+            authentication {
-               'docinfo1':           ''
+                header(HttpHeaderAuthentication)
+            }
+        }
+    }
 }
 
-build.dependsOn(['asciidoctor'])
+asciidoctorPdf {
+    dependsOn asciidoctorGemsPrepare
+
+    baseDirFollowsSourceFile()
+
+    asciidoctorj {
+        requires 'rouge', 'asciidoctor-diagram'
+
+        attributes 'build-gradle':       file('build.gradle'),
+                   'endpoint-url':       'https://www.thpeetz.de',
+                   'source-highlighter': 'rouge',
+                   'imagesoutdir':       "$buildDir/asciidoc/pdf/images",
+                   'imagesdir':          "$buildDir/asciidoc/pdf/images",
+                   'toc':                'left',
+                   'toc-title':          'Inhaltsverzeichnis',
+                   'revdate':            BUILD_DATE,
+                   'revnumber':          { project.version.toString() },
+                   'revremark':          'Entwurf',
+                   'chapter-label':      '',
+                   'icons':              'font',
+                   'idprefix':           'id_',
+                   'idseparator':        '-',
+                   'docinfo1':           ''
+	}
+}
 
 wrapper {
-    gradleVersion = "5.6.1"
+    gradleVersion = "6.3"
 }

docs/gradle.properties

@@ -0,0 +1,5 @@
+description='Kalorienmanager'
+version=1.0.0-SNAPSHOT
+group=de.thpeetz.docs
+gitLabPrivateToken=bFcsw1ebNhoFgKysksU1
+projectId=53

docs/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

docs/settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = "Kalorienmanager"
+rootProject.name = "kalorienmanager"