Upgrade dokka to 1.6.10 following gradle upgrade (#114)

partiql · Mar 3, 2022 · b6a6191 · b6a6191
1 parent 87d24c7
commit b6a6191
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/pig-runtime/build.gradle b/pig-runtime/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id 'java-library'
     // https://docs.gradle.org/5.0/userguide/publishing_maven.html#header
     id 'maven-publish'
-    id 'org.jetbrains.dokka' version '0.9.18'
+    id 'org.jetbrains.dokka' version '1.6.10'
     id 'org.jetbrains.kotlin.jvm'
     id 'signing'
 }
@@ -48,9 +48,8 @@ test {
     useJUnitPlatform()
 }
 
-dokka {
-    outputFormat = "html"
-    outputDirectory = "$buildDir/javadoc"
+tasks.dokkaHtml.configure {
+    outputDirectory.set(file("$buildDir/javadoc"))
     //todo: includes = ["path/to/module.md"]
 }
 
@@ -60,8 +59,8 @@ task sourcesJar(type: Jar) {
 }
 
 task javadocJar(type: Jar) {
-    from dokka
-    classifier = "javadoc"
+    from dokkaHtml
+    archiveClassifier.set("javadoc")
 }
 
 publishing {

diff --git a/pig/build.gradle b/pig/build.gradle
@@ -18,7 +18,7 @@
 plugins {
     id 'application'
     id 'maven-publish'
-    id 'org.jetbrains.dokka' version '0.9.18'
+    id 'org.jetbrains.dokka' version '1.6.10'
     id 'org.jetbrains.kotlin.jvm'
     id 'signing'
 }
@@ -54,13 +54,11 @@ test {
     useJUnitPlatform()
 }
 
-dokka {
-    outputFormat = "html"
-    outputDirectory = "$buildDir/javadoc"
+tasks.dokkaHtml.configure {
+    outputDirectory.set(file("$buildDir/javadoc"))
     //todo: includes = ["path/to/module.md"]
 }
 
-
 //create a single Jar with all dependencies
 jar {
     manifest {
@@ -77,8 +75,8 @@ task sourcesJar(type: Jar) {
 }
 
 task javadocJar(type: Jar) {
-    from dokka
-    classifier = "javadoc"
+    from dokkaHtml
+    archiveClassifier.set("javadoc")
 }
 
 build {