aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt1
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt8
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<Project> {
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)