diff options
3 files changed, 5 insertions, 21 deletions
diff --git a/runners/cli/src/main/kotlin/cli/main.kt b/runners/cli/src/main/kotlin/cli/main.kt index a30ffa42..989a45a1 100644 --- a/runners/cli/src/main/kotlin/cli/main.kt +++ b/runners/cli/src/main/kotlin/cli/main.kt @@ -126,7 +126,7 @@ private fun parseSourceSet(args: Array<String>): DokkaConfiguration.DokkaSourceS description = "Name of the source set" ).default("main") - val sourceSetDisplayName by parser.option( + val displayName by parser.option( ArgType.String, description = "Displayed name of the source set" ).default("JVM") @@ -142,14 +142,9 @@ private fun parseSourceSet(args: Array<String>): DokkaConfiguration.DokkaSourceS fullName = "src" ).delimiter(";") - val dependentSourceRoots by parser.option( - ArgType.String, - description = "Source file or directory (allows many paths separated by the semicolon `;`)" - ).delimiter(";") - val dependentSourceSets by parser.option( ArgType.String, - description = "Names of dependent source sets (allows many paths separated by the semicolon `;`)" + description = "Names of dependent source sets in format \"moduleName/sourceSetName\" (allows many paths separated by the semicolon `;`)" ).delimiter(";") val samples by parser.option( @@ -165,7 +160,7 @@ private fun parseSourceSet(args: Array<String>): DokkaConfiguration.DokkaSourceS val includeNonPublic: Boolean by parser.option(ArgType.Boolean, description = "Include non public") .default(DokkaDefaults.includeNonPublic) - val includeRootPackage by parser.option(ArgType.Boolean, description = "Include non public") + val includeRootPackage by parser.option(ArgType.Boolean, description = "Include root package") .default(DokkaDefaults.includeRootPackage) val reportUndocumented by parser.option(ArgType.Boolean, description = "Report undocumented members") @@ -230,12 +225,12 @@ private fun parseSourceSet(args: Array<String>): DokkaConfiguration.DokkaSourceS return object : DokkaConfiguration.DokkaSourceSet { override val moduleDisplayName = moduleDisplayName ?: moduleName - override val displayName = sourceSetDisplayName + override val displayName = displayName override val sourceSetID = DokkaSourceSetID(moduleName, sourceSetName) override val classpath = classpath override val sourceRoots = sourceRoots.map { SourceRootImpl(it.toAbsolutePath()) } override val dependentSourceSets: Set<DokkaSourceSetID> = dependentSourceSets - .map { dependentSourceSetName -> DokkaSourceSetID(moduleName, dependentSourceSetName) } + .map { dependentSourceSetName -> dependentSourceSetName.split('/').let { DokkaSourceSetID(it[0], it[1]) } } .toSet() override val samples = samples.map { it.toAbsolutePath() } override val includes = includes.map { it.toAbsolutePath() } 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 26adb534..affab485 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 @@ -1,19 +1,9 @@ package org.jetbrains.dokka.gradle import com.google.gson.GsonBuilder -import org.gradle.api.DefaultTask -import org.gradle.api.artifacts.Configuration -import org.gradle.api.attributes.Usage -import org.gradle.api.plugins.JavaBasePlugin -import org.gradle.api.tasks.Classpath import org.gradle.api.tasks.Input import org.gradle.api.tasks.Internal -import org.gradle.api.tasks.TaskAction -import org.jetbrains.dokka.DokkaBootstrap -import org.jetbrains.dokka.DokkaVersion import org.jetbrains.dokka.plugability.Configurable -import java.net.URLClassLoader -import java.util.function.BiConsumer open class DokkaMultimoduleTask : AbstractDokkaTask(), Configurable { 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 78c82888..0d7e74a3 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 @@ -8,7 +8,6 @@ import org.gradle.api.file.FileCollection import org.gradle.api.internal.plugins.DslObject import org.gradle.api.plugins.JavaBasePlugin import org.gradle.api.tasks.* -import org.gradle.kotlin.dsl.getValue import org.jetbrains.dokka.DokkaConfiguration.ExternalDocumentationLink.Builder import org.jetbrains.dokka.DokkaConfiguration.SourceRoot import org.jetbrains.dokka.DokkaException |