diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2017-02-23 15:21:03 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2017-02-23 15:21:03 +0100 |
| commit | a39c7a161282d132d08bcf89eed0213374a574e9 (patch) | |
| tree | 973c36ded09cfd3a92b1fbfef947503b5ee71afe /runners | |
| parent | 287c8207f6c7534ac9c5dfbc6e2ce10fae9a696b (diff) | |
| download | dokka-a39c7a161282d132d08bcf89eed0213374a574e9.tar.gz dokka-a39c7a161282d132d08bcf89eed0213374a574e9.tar.bz2 dokka-a39c7a161282d132d08bcf89eed0213374a574e9.zip | |
Allow specifying implicit platforms for each source root
Diffstat (limited to 'runners')
| -rw-r--r-- | runners/ant/src/main/kotlin/ant/dokka.kt | 7 | ||||
| -rw-r--r-- | runners/cli/src/main/kotlin/cli/main.kt | 2 | ||||
| -rw-r--r-- | runners/maven-plugin/src/main/kotlin/DokkaMojo.kt | 9 |
3 files changed, 8 insertions, 10 deletions
diff --git a/runners/ant/src/main/kotlin/ant/dokka.kt b/runners/ant/src/main/kotlin/ant/dokka.kt index 38dc543b..98c44d11 100644 --- a/runners/ant/src/main/kotlin/ant/dokka.kt +++ b/runners/ant/src/main/kotlin/ant/dokka.kt @@ -5,10 +5,7 @@ import org.apache.tools.ant.Project import org.apache.tools.ant.Task import org.apache.tools.ant.types.Path import org.apache.tools.ant.types.Reference -import org.jetbrains.dokka.DocumentationOptions -import org.jetbrains.dokka.DokkaGenerator -import org.jetbrains.dokka.DokkaLogger -import org.jetbrains.dokka.SourceLinkDefinition +import org.jetbrains.dokka.* import java.io.File class AntLogger(val task: Task): DokkaLogger { @@ -87,7 +84,7 @@ class DokkaAntTask(): Task() { val generator = DokkaGenerator( AntLogger(this), compileClasspath.list().toList(), - sourcePath.list().toList(), + sourcePath.list().map { SourceRoot(it) }, samplesPath.list().toList(), includesPath.list().toList(), moduleName!!, diff --git a/runners/cli/src/main/kotlin/cli/main.kt b/runners/cli/src/main/kotlin/cli/main.kt index afc67e45..f41e4715 100644 --- a/runners/cli/src/main/kotlin/cli/main.kt +++ b/runners/cli/src/main/kotlin/cli/main.kt @@ -78,7 +78,7 @@ object MainKt { val generator = DokkaGenerator( DokkaConsoleLogger, classPath, - sources, + sources.map(::parseSourceRoot), samples, includes, arguments.moduleName, diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt index 899d2dde..c3cf7509 100644 --- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt +++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt @@ -7,11 +7,12 @@ import org.apache.maven.plugin.AbstractMojo import org.apache.maven.plugins.annotations.* import org.apache.maven.project.MavenProject import org.apache.maven.project.MavenProjectHelper -import org.jetbrains.dokka.DokkaGenerator -import org.jetbrains.dokka.SourceLinkDefinition -import org.jetbrains.dokka.DocumentationOptions import org.codehaus.plexus.archiver.Archiver import org.codehaus.plexus.archiver.jar.JarArchiver +import org.jetbrains.dokka.DocumentationOptions +import org.jetbrains.dokka.DokkaGenerator +import org.jetbrains.dokka.SourceLinkDefinition +import org.jetbrains.dokka.SourceRoot import java.io.File class SourceLinkMapItem { @@ -66,7 +67,7 @@ abstract class AbstractDokkaMojo : AbstractMojo() { val gen = DokkaGenerator( MavenDokkaLogger(log), classpath, - sourceDirectories, + sourceDirectories.map { SourceRoot(it) }, samplesDirs, includeDirs + includes, moduleName, |