aboutsummaryrefslogtreecommitdiff
path: root/runners/gradle-plugin/src/main/kotlin
diff options
context:
space:
mode:
authorsebastian.sellmair <sebastian.sellmair@jetbrains.com>2020-07-13 13:47:30 +0200
committerSebastian Sellmair <34319766+sellmair@users.noreply.github.com>2020-07-13 14:23:08 +0200
commitff1bb8085cd87eb20079a66f19c688b092d583f4 (patch)
tree9de7ccf844040e6590b64995fb933adb9e11e05b /runners/gradle-plugin/src/main/kotlin
parent57b9432fb971926c9a6a904f932d69c7fa022ef3 (diff)
downloaddokka-ff1bb8085cd87eb20079a66f19c688b092d583f4.tar.gz
dokka-ff1bb8085cd87eb20079a66f19c688b092d583f4.tar.bz2
dokka-ff1bb8085cd87eb20079a66f19c688b092d583f4.zip
Remove DokkaTask.subprojects in favor of DokkaMultimodule and DokkaCollector
Diffstat (limited to 'runners/gradle-plugin/src/main/kotlin')
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt23
1 files changed, 1 insertions, 22 deletions
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 c5077bb8..ab36bb63 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
@@ -43,9 +43,6 @@ open class DokkaTask : AbstractDokkaTask() {
dependsOn(Callable { kotlinTasks.map { it.taskDependencies } })
}
- @Input
- var subProjects: List<String> = emptyList()
-
@Optional
@Input
var cacheRoot: String? = null
@@ -202,7 +199,7 @@ open class DokkaTask : AbstractDokkaTask() {
if (disableAutoconfiguration) return userConfig
- val baseConfig = configExtractor.extractConfiguration(userConfig.name)
+ return configExtractor.extractConfiguration(userConfig.name)
?.let { mergeUserConfigurationAndPlatformData(userConfig, it) }
?: if (this.dokkaSourceSets.isNotEmpty()) {
if (outputDiagnosticInfo)
@@ -216,24 +213,6 @@ open class DokkaTask : AbstractDokkaTask() {
logger.warn("Could not find source set with name: ${userConfig.name} in Kotlin Gradle Plugin")
collectFromSinglePlatformOldPlugin(userConfig.name, userConfig)
}
-
- return if (subProjects.isNotEmpty()) {
- try {
- subProjects.toProjects().fold(baseConfig) { configAcc, subProject ->
- mergeUserConfigurationAndPlatformData(
- configAcc,
- ConfigurationExtractor(subProject).extractConfiguration(userConfig.name)!!
- )
- }
- } catch (e: NullPointerException) {
- logger.warn(
- "Cannot extract sources from subProjects. Do you have the Kotlin plugin applied in the root project?"
- )
- baseConfig
- }
- } else {
- baseConfig
- }
}
private fun collectFromSinglePlatformOldPlugin(name: String, userConfig: GradleDokkaSourceSet) =