Merge pull request #58 from aPureBase/upgrade-dokka

Upgrade dokka version and configuration

Author: AndreasVolkmann

arkenv-yaml/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
  base
  java
  kotlin("jvm") version "1.4.32"
- id("org.jetbrains.dokka") version "0.10.1"
+ id("org.jetbrains.dokka") version "1.4.32"
  signing
 }
 
@@ -34,13 +34,14 @@ tasks {
  )
  }
  }
- dokka {
- outputFormat = "html"
- outputDirectory = "$buildDir/javadoc"
- impliedPlatforms = mutableListOf("JVM")
- configuration {
- jdkVersion = 8
- reportUndocumented = true
+ dokkaHtml {
+ outputDirectory.set(buildDir.resolve("javadoc"))
+ dokkaSourceSets {
+ configureEach {
+ jdkVersion.set(8)
+ reportUndocumented.set(true)
+ platform.set(org.jetbrains.dokka.Platform.jvm)
+ }
  }
  }
 }
@@ -53,7 +54,7 @@ val sourcesJar by tasks.creating(Jar::class) {
 val dokkaJar by tasks.creating(Jar::class) {
  group = JavaBasePlugin.DOCUMENTATION_GROUP
  classifier = "javadoc"
- from(tasks.dokka)
+ from(tasks.dokkaHtml)
 }
 
 publishing {

arkenv/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
  base
  kotlin("jvm") version "1.4.32"
- id("org.jetbrains.dokka") version "0.10.1"
+ id("org.jetbrains.dokka") version "1.4.32"
  id("java-test-fixtures")
  signing
 }
@@ -43,13 +43,14 @@ tasks {
  )
  }
  }
- dokka {
- outputFormat = "html"
- outputDirectory = "$buildDir/javadoc"
- impliedPlatforms = mutableListOf("JVM")
- configuration {
- jdkVersion = 8
- reportUndocumented = true
+ dokkaHtml {
+ outputDirectory.set(buildDir.resolve("javadoc"))
+ dokkaSourceSets {
+ configureEach {
+ jdkVersion.set(8)
+ reportUndocumented.set(true)
+ platform.set(org.jetbrains.dokka.Platform.jvm)
+ }
  }
  }
 }
@@ -62,7 +63,7 @@ val sourcesJar by tasks.creating(Jar::class) {
 val dokkaJar by tasks.creating(Jar::class) {
  group = JavaBasePlugin.DOCUMENTATION_GROUP
  classifier = "javadoc"
- from(tasks.dokka)
+ from(tasks.dokkaHtml)
 }
 
 

gradle.properties

@@ -6,5 +6,5 @@ junitVersion=5.7.0
 snakeyamlVersion=1.28
 jmockitVersion=1.49
 kluentVersion=1.65
-striktVersion=0.30.1
+striktVersion=0.31.0