diff options
Diffstat (limited to 'runners')
7 files changed, 4 insertions, 28 deletions
diff --git a/runners/cli/src/main/kotlin/cli/main.kt b/runners/cli/src/main/kotlin/cli/main.kt index d284e653..a30ffa42 100644 --- a/runners/cli/src/main/kotlin/cli/main.kt +++ b/runners/cli/src/main/kotlin/cli/main.kt @@ -20,11 +20,6 @@ class GlobalArguments(args: Array<String>) : DokkaConfiguration { override val outputDir by parser.option(ArgType.String, description = "Output directory path") .default(DokkaDefaults.outputDir) - override val format by parser.option( - ArgType.String, - description = "Output format (html, gfm, jekyll)" - ).default(DokkaDefaults.format) - override val cacheRoot by parser.option( ArgType.String, description = "Path to cache folder, or 'default' to use ~/.cache/dokka, if not provided caching is disabled" diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt index 7aa7c0fa..da834775 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt @@ -37,8 +37,8 @@ open class DokkaCollectorTask : DefaultTask() { // TODO this certainly not the ideal solution configuration = configurations.fold(initial) { acc, it: GradleDokkaConfigurationImpl -> - if (acc.format != it.format || acc.cacheRoot != it.cacheRoot) - throw IllegalStateException("Dokka task configurations differ on core arguments (format, cacheRoot)") + if (acc.cacheRoot != it.cacheRoot) + throw IllegalStateException("Dokka task configurations differ on core argument cacheRoot") acc.sourceSets = acc.sourceSets + it.sourceSets acc.pluginsClasspath = (acc.pluginsClasspath + it.pluginsClasspath).distinct() acc diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultimoduleTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultimoduleTask.kt index 3ed81054..76a2e80a 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultimoduleTask.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultimoduleTask.kt @@ -21,9 +21,6 @@ open class DokkaMultimoduleTask : DefaultTask(), Configurable { var documentationFileName: String = "README.md" @Input - var outputFormat: String = "html" - - @Input var outputDirectory: String = "" @Input @@ -73,7 +70,6 @@ open class DokkaMultimoduleTask : DefaultTask(), Configurable { internal fun getConfiguration(): GradleDokkaConfigurationImpl = GradleDokkaConfigurationImpl().apply { outputDir = project.file(outputDirectory).absolutePath - format = outputFormat pluginsClasspath = plugins.resolve().toList() pluginsConfiguration = this@DokkaMultimoduleTask.pluginsConfiguration modules = project.subprojects diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt index 09088968..2bdfa0bd 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt @@ -46,9 +46,6 @@ open class DokkaTask : DefaultTask(), Configurable { } @Input - var outputFormat: String = "html" - - @Input var outputDirectory: String = "" @Input @@ -186,7 +183,6 @@ open class DokkaTask : DefaultTask(), Configurable { return GradleDokkaConfigurationImpl().apply { outputDir = project.file(outputDirectory).absolutePath - format = outputFormat cacheRoot = this@DokkaTask.cacheRoot offlineMode = this@DokkaTask.offlineMode sourceSets = defaultModulesConfiguration diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt index 49819f9a..b6b8399c 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt @@ -225,7 +225,6 @@ class GradleDokkaModuleDescription : DokkaModuleDescription { class GradleDokkaConfigurationImpl : DokkaConfiguration { override var outputDir: String = "" - override var format: String = DokkaDefaults.format override var cacheRoot: String? = DokkaDefaults.cacheRoot override var offlineMode: Boolean = DokkaDefaults.offlineMode override var failOnWarning: Boolean = DokkaDefaults.failOnWarning diff --git a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt index da6daeea..3ba5602f 100644 --- a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt +++ b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt @@ -13,10 +13,10 @@ class KotlinDslDokkaTaskConfigurationTest { fun `configure project using dokka extension function`() { val project = ProjectBuilder.builder().build() project.plugins.apply("org.jetbrains.dokka") - project.dokka { this.outputFormat = "test" } + project.dokka { this.outputDirectory = "test" } project.tasks.withType(DokkaTask::class.java).forEach { dokkaTask -> - assertEquals("test", dokkaTask.outputFormat) + assertEquals("test", dokkaTask.outputDirectory) } } diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt index aa92516f..fdd1c646 100644 --- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt +++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt @@ -170,8 +170,6 @@ abstract class AbstractDokkaMojo : AbstractMojo() { protected abstract fun getOutDir(): String - protected abstract fun getOutFormat(): String - override fun execute() { if (skip) { log.info("Dokka skip parameter is true so no dokka output will be produced") @@ -239,7 +237,6 @@ abstract class AbstractDokkaMojo : AbstractMojo() { val configuration = DokkaConfigurationImpl( outputDir = getOutDir(), - format = getOutFormat(), offlineMode = offlineMode, cacheRoot = cacheRoot, sourceSets = listOf(sourceSet).also { @@ -319,13 +316,9 @@ abstract class AbstractDokkaMojo : AbstractMojo() { requiresProject = true ) class DokkaMojo : AbstractDokkaMojo() { - @Parameter(required = true, defaultValue = "html") - var outputFormat: String = "html" - @Parameter(required = true, defaultValue = "\${project.basedir}/target/dokka") var outputDir: String = "" - override fun getOutFormat() = outputFormat override fun getOutDir() = outputDir } @@ -339,8 +332,6 @@ class DokkaMojo : AbstractDokkaMojo() { class DokkaJavadocMojo : AbstractDokkaMojo() { @Parameter(required = true, defaultValue = "\${project.basedir}/target/dokkaJavadoc") var outputDir: String = "" - - override fun getOutFormat() = "javadoc" override fun getOutDir() = outputDir } @@ -396,7 +387,6 @@ class DokkaJavadocJarMojo : AbstractDokkaMojo() { @Component(role = Archiver::class, hint = "jar") private var jarArchiver: JarArchiver? = null - override fun getOutFormat() = "javadoc" override fun getOutDir() = outputDir override fun execute() { |