From 177aff68f26b01c20508a51272607829c831d323 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Tue, 16 May 2017 18:26:22 +0300
Subject: Fix runner parameters for consistency, add default link to stdlib

---
 runners/gradle-plugin/src/main/kotlin/main.kt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'runners/gradle-plugin')

diff --git a/runners/gradle-plugin/src/main/kotlin/main.kt b/runners/gradle-plugin/src/main/kotlin/main.kt
index bfa8feea..afd1f762 100644
--- a/runners/gradle-plugin/src/main/kotlin/main.kt
+++ b/runners/gradle-plugin/src/main/kotlin/main.kt
@@ -87,6 +87,7 @@ open class DokkaTask : DefaultTask() {
 
     @Input var externalDocumentationLinks = mutableListOf<DokkaConfiguration.ExternalDocumentationLink>()
 
+    @Input var noStdlibLink: Boolean = false
 
     protected open val sdkProvider: SdkProvider? = null
 
@@ -195,7 +196,8 @@ open class DokkaTask : DefaultTask() {
                     linkMappings,
                     impliedPlatforms,
                     perPackageOptions,
-                    externalDocumentationLinks)
+                    externalDocumentationLinks,
+                    noStdlibLink)
 
 
             bootstrapProxy.configure(
@@ -217,10 +219,6 @@ open class DokkaTask : DefaultTask() {
     }
 
     fun collectSourceRoots(): List<SourceRoot> {
-        if (sourceRoots.any()) {
-            return sourceRoots
-        }
-
         val provider = sdkProvider
         val sourceDirs = if (sourceDirs.any()) {
             logger.info("Dokka: Taking source directories provided by the user")
@@ -235,7 +233,7 @@ open class DokkaTask : DefaultTask() {
             sourceSets?.allSource?.srcDirs
         }
 
-        return sourceDirs?.filter { it.exists() }?.map { SourceRoot().apply { path = it.path } } ?: emptyList()
+        return sourceRoots + (sourceDirs?.filter { it.exists() }?.map { SourceRoot().apply { path = it.path } } ?: emptyList())
     }
 
     @InputFiles
-- 
cgit