From 15b2793acf7ff37eb0e061dffd899570b8325ed4 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 9 Jan 2021 23:42:30 +0100 Subject: [PATCH] Remove dokka javadoc for now --- buildSrc/src/main/kotlin/Deps.kt | 4 ++-- multiplatform-crypto-api/build.gradle.kts | 16 ---------------- .../build.gradle.kts | 11 ++++++----- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt index edf6f4a..09b4ee0 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -15,13 +15,13 @@ */ object Versions { - val kotlinCoroutines = "1.4.1" + val kotlinCoroutines = "1.4.2" val kotlin = "1.4.20" val kotlinSerialization = "1.0.1" val kotlinSerializationPlugin = "1.4.10" val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build val nodePlugin = "1.3.0" - val dokkaPlugin = "1.4.0" + val dokkaPlugin = "1.4.20" val taskTreePlugin = "1.5" val kotlinBigNumVersion = "0.2.2" val lazySodium = "4.3.1-SNAPSHOT" diff --git a/multiplatform-crypto-api/build.gradle.kts b/multiplatform-crypto-api/build.gradle.kts index 4c655f0..30299cc 100644 --- a/multiplatform-crypto-api/build.gradle.kts +++ b/multiplatform-crypto-api/build.gradle.kts @@ -267,23 +267,7 @@ kotlin { } tasks { - create("javadocJar") { - dependsOn(dokkaJavadoc) - archiveClassifier.set("javadoc") - from(dokkaJavadoc.get().outputDirectory) - } - dokkaJavadoc { - println("Dokka !") - dokkaSourceSets { - named("commonMain") { - displayName.set("common") - platform.set(Platform.common) - } - } - - - } if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") { val jvmTest by getting(Test::class) { diff --git a/multiplatform-crypto-libsodium-bindings/build.gradle.kts b/multiplatform-crypto-libsodium-bindings/build.gradle.kts index 7aee1fb..dcc8a9e 100644 --- a/multiplatform-crypto-libsodium-bindings/build.gradle.kts +++ b/multiplatform-crypto-libsodium-bindings/build.gradle.kts @@ -28,10 +28,10 @@ plugins { id(PluginsDeps.mavenPublish) id(PluginsDeps.signing) id(PluginsDeps.node) version Versions.nodePlugin - id(PluginsDeps.dokka) id(PluginsDeps.taskTree) version Versions.taskTreePlugin id(PluginsDeps.androidLibrary) id(PluginsDeps.kotlinAndroidExtensions) + id(PluginsDeps.dokka) } @@ -595,9 +595,9 @@ tasks { dokkaJavadoc { println("Dokka !") dokkaSourceSets { - named("commonMain") { - displayName.set("common") - platform.set(Platform.common) + named("jvmMain") { + displayName.set("jvm") + platform.set(Platform.jvm) } } @@ -610,11 +610,12 @@ tasks { named("commonMain") { // displayName.set("common") // platform.set(Platform.common) - moduleDisplayName.set("Kotlin Multiplatform Libsodium Bindings") + moduleName.set("Kotlin Multiplatform Libsodium Bindings") includes.from( "src/commonMain/kotlin/com.ionspin.kotlin.crypto/aead/Aead.md", "src/commonMain/kotlin/com.ionspin.kotlin.crypto/auth/Auth.md", "src/commonMain/kotlin/com.ionspin.kotlin.crypto/box/Box.md", + "src/commonMain/kotlin/com.ionspin.kotlin.crypto/generichash/GenericHash.md", "src/commonMain/kotlin/com.ionspin.kotlin.crypto/CryptoModule.md") displayName.set("Kotlin multiplatform") }