From d131b2bff3831cf9710675fe6828c77274ffed69 Mon Sep 17 00:00:00 2001
From: Brian Norman <brian@bnorm.com>
Date: Sun, 10 Jul 2022 13:44:22 -0500
Subject: [PATCH] Fix Dokka publishing

---
 build.gradle.kts                                   | 2 +-
 kotlin-power-assert-plugin-native/build.gradle.kts | 9 ++-------
 kotlin-power-assert-plugin/build.gradle.kts        | 9 ++-------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 29456bd..f4b3d53 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   kotlin("jvm") version "1.7.0" apply false
-  id("org.jetbrains.dokka") version "0.10.0" apply false
+  id("org.jetbrains.dokka") version "1.7.0" apply false
   id("com.gradle.plugin-publish") version "0.11.0" apply false
   id("com.github.gmazzo.buildconfig") version "2.0.2" apply false
 }
diff --git a/kotlin-power-assert-plugin-native/build.gradle.kts b/kotlin-power-assert-plugin-native/build.gradle.kts
index 3a364ce..19b06ab 100644
--- a/kotlin-power-assert-plugin-native/build.gradle.kts
+++ b/kotlin-power-assert-plugin-native/build.gradle.kts
@@ -33,11 +33,6 @@ tasks.withType<KotlinCompile> {
   kotlinOptions.jvmTarget = "1.8"
 }
 
-tasks.dokka {
-  outputFormat = "html"
-  outputDirectory = "$buildDir/javadoc"
-}
-
 tasks.register("sourcesJar", Jar::class) {
   group = "build"
   description = "Assembles Kotlin sources"
@@ -52,8 +47,8 @@ tasks.register("dokkaJar", Jar::class) {
   description = "Assembles Kotlin docs with Dokka"
 
   archiveClassifier.set("javadoc")
-  from(tasks.dokka)
-  dependsOn(tasks.dokka)
+  from(tasks.dokkaHtml)
+  dependsOn(tasks.dokkaHtml)
 }
 
 signing {
diff --git a/kotlin-power-assert-plugin/build.gradle.kts b/kotlin-power-assert-plugin/build.gradle.kts
index ff1b805..a2afc70 100644
--- a/kotlin-power-assert-plugin/build.gradle.kts
+++ b/kotlin-power-assert-plugin/build.gradle.kts
@@ -28,11 +28,6 @@ tasks.withType<Test> {
   useJUnitPlatform()
 }
 
-tasks.dokka {
-  outputFormat = "html"
-  outputDirectory = "$buildDir/javadoc"
-}
-
 tasks.register("sourcesJar", Jar::class) {
   group = "build"
   description = "Assembles Kotlin sources"
@@ -47,8 +42,8 @@ tasks.register("dokkaJar", Jar::class) {
   description = "Assembles Kotlin docs with Dokka"
 
   archiveClassifier.set("javadoc")
-  from(tasks.dokka)
-  dependsOn(tasks.dokka)
+  from(tasks.dokkaHtml)
+  dependsOn(tasks.dokkaHtml)
 }
 
 signing {