diff options
| author | Zubakov <aleks.zubakov@gmail.com> | 2018-09-12 17:22:33 +0300 |
|---|---|---|
| committer | Zubakov <aleks.zubakov@gmail.com> | 2018-09-12 17:22:33 +0300 |
| commit | b86d9801f7d66c27bbf82608572e7f72b06655bb (patch) | |
| tree | b9e125d5d0728cb83a37c1a544447fdcd3b49f27 /core/src/main/kotlin/Generation | |
| parent | 64c3ecdf587c07ec9e38992825d7eaf654e70408 (diff) | |
| download | dokka-b86d9801f7d66c27bbf82608572e7f72b06655bb.tar.gz dokka-b86d9801f7d66c27bbf82608572e7f72b06655bb.tar.bz2 dokka-b86d9801f7d66c27bbf82608572e7f72b06655bb.zip | |
Bundled compiler version upgraded
Diffstat (limited to 'core/src/main/kotlin/Generation')
| -rw-r--r-- | core/src/main/kotlin/Generation/DokkaGenerator.kt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/kotlin/Generation/DokkaGenerator.kt b/core/src/main/kotlin/Generation/DokkaGenerator.kt index 1193657e..f4161de9 100644 --- a/core/src/main/kotlin/Generation/DokkaGenerator.kt +++ b/core/src/main/kotlin/Generation/DokkaGenerator.kt @@ -11,6 +11,7 @@ import org.jetbrains.dokka.Generation.DocumentationMerger import org.jetbrains.dokka.Utilities.DokkaAnalysisModule import org.jetbrains.dokka.Utilities.DokkaOutputModule import org.jetbrains.dokka.Utilities.DokkaRunModule +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector @@ -184,7 +185,7 @@ fun buildDocumentationModule(injector: Injector, } fun parseJavaPackageDocs(packageDocs: PackageDocs, coreEnvironment: KotlinCoreEnvironment) { - val contentRoots = coreEnvironment.configuration.get(JVMConfigurationKeys.CONTENT_ROOTS) + val contentRoots = coreEnvironment.configuration.get(CLIConfigurationKeys.CONTENT_ROOTS) ?.filterIsInstance<JavaSourceRoot>() ?.map { it.file } ?: listOf() @@ -197,7 +198,7 @@ fun parseJavaPackageDocs(packageDocs: PackageDocs, coreEnvironment: KotlinCoreEn fun KotlinCoreEnvironment.getJavaSourceFiles(): List<PsiJavaFile> { - val sourceRoots = configuration.get(JVMConfigurationKeys.CONTENT_ROOTS) + val sourceRoots = configuration.get(CLIConfigurationKeys.CONTENT_ROOTS) ?.filterIsInstance<JavaSourceRoot>() ?.map { it.file } ?: listOf() |