From 0883ddf80141330d20303ebf23b10f5ba48e3888 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sun, 2 Aug 2020 18:34:45 +0200 Subject: [PATCH] Updated dokka --- buildSrc/src/main/kotlin/Deps.kt | 2 +- multiplatform-crypto-api/build.gradle.kts | 12 ++++++------ multiplatform-crypto-delegated/build.gradle.kts | 6 +++--- .../build.gradle.kts | 6 +++--- multiplatform-crypto/build.gradle.kts | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt index 0869413..a4617e6 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -20,7 +20,7 @@ object Versions { val kotlinSerialization = "1.0-M1-1.4.0-rc" val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build val nodePlugin = "1.3.0" - val dokkaPlugin = "0.11.0-dev-44" + val dokkaPlugin = "1.4.0-M3-dev-92" val taskTreePlugin = "1.5" val kotlinBigNumVersion = "0.1.6-1.4.0-rc-SNAPSHOT" diff --git a/multiplatform-crypto-api/build.gradle.kts b/multiplatform-crypto-api/build.gradle.kts index 2f72099..110e300 100644 --- a/multiplatform-crypto-api/build.gradle.kts +++ b/multiplatform-crypto-api/build.gradle.kts @@ -22,9 +22,9 @@ import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest plugins { kotlin(PluginsDeps.multiplatform) - id (PluginsDeps.mavenPublish) - id (PluginsDeps.signing) - id (PluginsDeps.dokka) + id(PluginsDeps.mavenPublish) + id(PluginsDeps.signing) + id(PluginsDeps.dokka) } repositories { @@ -267,12 +267,12 @@ kotlin { tasks { create("javadocJar") { - dependsOn(dokka) + dependsOn(dokkaJavadoc) archiveClassifier.set("javadoc") - from(dokka.get().outputDirectory) + from(dokkaJavadoc.get().outputDirectory) } - dokka { + dokkaJavadoc { println("Dokka !") } if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") { diff --git a/multiplatform-crypto-delegated/build.gradle.kts b/multiplatform-crypto-delegated/build.gradle.kts index 257a7a9..12f3783 100644 --- a/multiplatform-crypto-delegated/build.gradle.kts +++ b/multiplatform-crypto-delegated/build.gradle.kts @@ -528,12 +528,12 @@ tasks { create("javadocJar") { - dependsOn(dokka) + dependsOn(dokkaJavadoc) archiveClassifier.set("javadoc") - from(dokka.get().outputDirectory) + from(dokkaJavadoc.get().outputDirectory) } - dokka { + dokkaJavadoc { println("Dokka !") } if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") { diff --git a/multiplatform-crypto-libsodium-bindings/build.gradle.kts b/multiplatform-crypto-libsodium-bindings/build.gradle.kts index 257a7a9..12f3783 100644 --- a/multiplatform-crypto-libsodium-bindings/build.gradle.kts +++ b/multiplatform-crypto-libsodium-bindings/build.gradle.kts @@ -528,12 +528,12 @@ tasks { create("javadocJar") { - dependsOn(dokka) + dependsOn(dokkaJavadoc) archiveClassifier.set("javadoc") - from(dokka.get().outputDirectory) + from(dokkaJavadoc.get().outputDirectory) } - dokka { + dokkaJavadoc { println("Dokka !") } if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") { diff --git a/multiplatform-crypto/build.gradle.kts b/multiplatform-crypto/build.gradle.kts index 658036b..2d826e4 100644 --- a/multiplatform-crypto/build.gradle.kts +++ b/multiplatform-crypto/build.gradle.kts @@ -392,12 +392,12 @@ tasks { create("javadocJar") { - dependsOn(dokka) + dependsOn(dokkaJavadoc) archiveClassifier.set("javadoc") - from(dokka.get().outputDirectory) + from(dokkaJavadoc.get().outputDirectory) } - dokka { + dokkaJavadoc { println("Dokka !") } if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {