aboutsummaryrefslogtreecommitdiff
path: root/runners/gradle-plugin/src/main/kotlin
diff options
context:
space:
mode:
authorsebastian.sellmair <sebastian.sellmair@jetbrains.com>2020-07-09 16:30:36 +0200
committerSebastian Sellmair <34319766+sellmair@users.noreply.github.com>2020-07-13 14:23:08 +0200
commit2c967fb5389b0f7891b59d8a9334e4efca546b46 (patch)
tree2db3180c5f17f4210f25bf94fe824427bec1d3ec /runners/gradle-plugin/src/main/kotlin
parent8525326620eab855c2a0af83acfd47efb431d253 (diff)
downloaddokka-2c967fb5389b0f7891b59d8a9334e4efca546b46.tar.gz
dokka-2c967fb5389b0f7891b59d8a9334e4efca546b46.tar.bz2
dokka-2c967fb5389b0f7891b59d8a9334e4efca546b46.zip
Remove `format` from dokka DokkaConfiguration
Diffstat (limited to 'runners/gradle-plugin/src/main/kotlin')
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt4
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultimoduleTask.kt4
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt4
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt1
4 files changed, 2 insertions, 11 deletions
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