From c18053227f4cc2ffc06453b45a5a8a6c902a43f3 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Sun, 15 Sep 2019 23:04:23 +0200
Subject: Add merging samples and includes from global config

---
 .../src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt             | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runners/gradle-plugin/src')

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
     }
-- 
cgit