aboutsummaryrefslogtreecommitdiff
path: root/runners
diff options
context:
space:
mode:
authorKamil Doległo <kamilok1965@interia.pl>2019-09-15 23:04:23 +0200
committerKamil Doległo <kamilok1965@interia.pl>2019-09-15 23:04:23 +0200
commitc18053227f4cc2ffc06453b45a5a8a6c902a43f3 (patch)
treed2325de2eacbe3bdb0247a5c47b093864211d2e4 /runners
parentf8cf88068368e5ae9a2b2aa90b0bc38e3238fac1 (diff)
downloaddokka-c18053227f4cc2ffc06453b45a5a8a6c902a43f3.tar.gz
dokka-c18053227f4cc2ffc06453b45a5a8a6c902a43f3.tar.bz2
dokka-c18053227f4cc2ffc06453b45a5a8a6c902a43f3.zip
Add merging samples and includes from global config
Diffstat (limited to 'runners')
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt2
1 files changed, 2 insertions, 0 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 4dc23b4b..63064b45 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
@@ -312,6 +312,8 @@ open class DokkaTask : DefaultTask() {
config.perPackageOptions.addAll(globalConfig.perPackageOptions)
config.externalDocumentationLinks.addAll(globalConfig.externalDocumentationLinks)
config.sourceLinks.addAll(globalConfig.sourceLinks)
+ config.samples += globalConfig.samples.map { project.file(it).absolutePath }
+ config.includes += globalConfig.includes.map { project.file(it).absolutePath }
}
return config
}