aboutsummaryrefslogtreecommitdiff
path: root/runners/cli
diff options
context:
space:
mode:
authorPaweł Marks <Kordyjan@users.noreply.github.com>2020-05-20 14:52:05 +0200
committerGitHub <noreply@github.com>2020-05-20 14:52:05 +0200
commitec9f4b3386ef979196e00334172051ece9a95acf (patch)
treef29b4101c306d824f39787d817bd038fbf740779 /runners/cli
parentff450fedb3c8bdc318b55954bc37d93b30b9277c (diff)
parent6b85bb2ec2764a2c8b14717ef8e013a0f3c6e99f (diff)
downloaddokka-ec9f4b3386ef979196e00334172051ece9a95acf.tar.gz
dokka-ec9f4b3386ef979196e00334172051ece9a95acf.tar.bz2
dokka-ec9f4b3386ef979196e00334172051ece9a95acf.zip
Merge pull request #867 from Kotlin/f/merging-source-set-hints
Merging of platform dependent hints in sourceset tree
Diffstat (limited to 'runners/cli')
-rw-r--r--runners/cli/src/main/kotlin/cli/main.kt12
1 files changed, 9 insertions, 3 deletions
diff --git a/runners/cli/src/main/kotlin/cli/main.kt b/runners/cli/src/main/kotlin/cli/main.kt
index f0d22aff..0818bd63 100644
--- a/runners/cli/src/main/kotlin/cli/main.kt
+++ b/runners/cli/src/main/kotlin/cli/main.kt
@@ -66,11 +66,12 @@ class Arguments(val parser: DokkaArgumentsParser) : DokkaConfiguration.PassConfi
)
override val sourceSetName: String by parser.stringOption(
- listOf("-module"),
+ listOf("-sourceSetName"),
"Name of the source set",
"main"
)
+
override val classpath: List<String> by parser.repeatableOption<String>(
listOf("-classpath"),
"Classpath for symbol resolution"
@@ -82,10 +83,15 @@ class Arguments(val parser: DokkaArgumentsParser) : DokkaConfiguration.PassConfi
) { SourceRootImpl(it) }
override val dependentSourceRoots: List<DokkaConfiguration.SourceRoot> by parser.repeatableOption(
- listOf("-src"),
- "Source file or directory (allows many paths separated by the system path separator)"
+ listOf("-dependentRoots"),
+ "Source roots of dependent source sets"
) { SourceRootImpl(it) }
+ override val dependentSourceSets: List<String> by parser.repeatableOption<String>(
+ listOf("-dependentSets"),
+ "Names of dependent source sets"
+ )
+
override val samples: List<String> by parser.repeatableOption<String>(
listOf("-sample"),
"Source root for samples"