aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/kotlin/Generation
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2017-02-23 16:35:45 +0100
committerDmitry Jemerov <yole@jetbrains.com>2017-02-23 16:35:45 +0100
commit99689adee954582da57268ff0375fdec52193a01 (patch)
tree82b41b04e568a564ba91473e1dcaba25b611a2b6 /core/src/main/kotlin/Generation
parenta39c7a161282d132d08bcf89eed0213374a574e9 (diff)
downloaddokka-99689adee954582da57268ff0375fdec52193a01.tar.gz
dokka-99689adee954582da57268ff0375fdec52193a01.tar.bz2
dokka-99689adee954582da57268ff0375fdec52193a01.zip
Merge declarations with the same signature defined for multiple platforms
Diffstat (limited to 'core/src/main/kotlin/Generation')
-rw-r--r--core/src/main/kotlin/Generation/DokkaGenerator.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/kotlin/Generation/DokkaGenerator.kt b/core/src/main/kotlin/Generation/DokkaGenerator.kt
index 95066eec..cc9a1b74 100644
--- a/core/src/main/kotlin/Generation/DokkaGenerator.kt
+++ b/core/src/main/kotlin/Generation/DokkaGenerator.kt
@@ -59,7 +59,8 @@ class DokkaGenerator(val logger: DokkaLogger,
logger.info("Analysing sources and libraries... ")
val startAnalyse = System.currentTimeMillis()
- val injector = Guice.createInjector(DokkaAnalysisModule(environment, options, implicitPlatforms, logger))
+ val injector = Guice.createInjector(
+ DokkaAnalysisModule(environment, options, implicitPlatforms, documentationModule.nodeRefGraph, logger))
buildDocumentationModule(injector, documentationModule, { isSample(it) }, includes)