From 7a8d9b36c45b937809e1b817ec465def8d0f71f9 Mon Sep 17 00:00:00 2001 From: Michael Bull Date: Sat, 30 Jan 2021 16:41:26 +0000 Subject: [PATCH] Update dependencies --- build.gradle.kts | 8 ++------ buildSrc/src/main/kotlin/Versions.kt | 10 +++++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f27f07f..0feb89c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -45,17 +45,13 @@ subprojects { plugins.withType { apply(plugin = "org.jetbrains.dokka") - val dokka by tasks.existing(DokkaTask::class) { - outputFormat = "javadoc" - outputDirectory = "$buildDir/docs/javadoc" - } + val dokkaJavadoc by tasks.existing(DokkaTask::class) val javadocJar by tasks.registering(Jar::class) { group = LifecycleBasePlugin.BUILD_GROUP description = "Assembles a jar archive containing the Javadoc API documentation." archiveClassifier.set("javadoc") - dependsOn(dokka) - from(dokka.get().outputDirectory) + from(dokkaJavadoc) } configure { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index d87faaf..5c2e3f6 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,9 +1,9 @@ object Versions { - const val dokka = "0.10.1" - const val kotlin = "1.4.0" + const val dokka = "1.4.20" + const val kotlin = "1.4.21-2" const val kotlinBenchmark = "0.2.0-dev-20" - const val kotlinCoroutines = "1.3.9" - const val ktor = "1.4.0" + const val kotlinCoroutines = "1.4.2" + const val ktor = "1.5.1" const val logback = "1.2.3" - const val versionsPlugin = "0.29.0" + const val versionsPlugin = "0.36.0" }