From 71497c5561afd62c1a4296bd0d0beb689dfd8e51 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Fri, 10 Jul 2020 07:41:24 +0200 Subject: Introduce dokkaKdoc task --- .../kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt | 1 - .../src/main/kotlin/org/jetbrains/dokka/gradle/main.kt | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt b/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt index 9f83c869..cfa752d6 100644 --- a/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt +++ b/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt @@ -33,7 +33,6 @@ class CliIntegrationTest : AbstractCliIntegrationTest() { val process = ProcessBuilder( "java", "-jar", cliJarFile.path, "-outputDir", dokkaOutputDir.path, - "-format", "html", "-pluginsClasspath", basePluginJarFile.path, "-sourceSet", buildString { diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt index 3e2c51f4..df854cd9 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt @@ -7,7 +7,13 @@ import java.io.File open class DokkaPlugin : Plugin { override fun apply(project: Project) { - project.createDokkaTasks("dokka") + project.createDokkaTasks("dokka") { + doFirst { + logger.warn(":dokka task is deprecated in favor of :dokkaKdoc") + } + } + + project.createDokkaTasks("dokkaKdoc") project.createDokkaTasks("dokkaJavadoc") { plugins.dependencies.add(project.dokkaArtifacts.javadocPlugin) -- cgit