diff options
| author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-06-26 15:25:09 +0300 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-06-26 15:25:09 +0300 |
| commit | 4810d07256c86825b85807dd93448279bde5b3b9 (patch) | |
| tree | d7cc5162acdbea196e3c086a3d43d3ed6fa688a8 /core/src/main | |
| parent | 1121071276ca2ce0afeabf4d3e540d4d8103f311 (diff) | |
| download | dokka-4810d07256c86825b85807dd93448279bde5b3b9.tar.gz dokka-4810d07256c86825b85807dd93448279bde5b3b9.tar.bz2 dokka-4810d07256c86825b85807dd93448279bde5b3b9.zip | |
Update bundled kotlin compiler to 1.1.3
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/kotlin/Analysis/AnalysisEnvironment.kt | 9 | ||||
| -rw-r--r-- | core/src/main/kotlin/Generation/DokkaGenerator.kt | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt index 15d0a26b..1a6ccbd0 100644 --- a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt +++ b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt @@ -14,10 +14,7 @@ import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.util.Disposer import com.intellij.psi.PsiElement import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analyzer.AnalysisResult -import org.jetbrains.kotlin.analyzer.ModuleContent -import org.jetbrains.kotlin.analyzer.ModuleInfo -import org.jetbrains.kotlin.analyzer.ResolverForModule +import org.jetbrains.kotlin.analyzer.* import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles @@ -111,10 +108,12 @@ class AnalysisEnvironment(val messageCollector: MessageCollector) : Disposable { val sourcesScope = createSourceModuleSearchScope(environment.project, sourceFiles) val builtIns = JvmBuiltIns(projectContext.storageManager) - val resolverForProject = JvmAnalyzerFacade.setupResolverForProject( + + val resolverForProject = AnalyzerFacade.setupResolverForProject( "Dokka", projectContext, listOf(library, module), + { JvmAnalyzerFacade }, { when (it) { library -> ModuleContent(emptyList(), GlobalSearchScope.notScope(sourcesScope)) diff --git a/core/src/main/kotlin/Generation/DokkaGenerator.kt b/core/src/main/kotlin/Generation/DokkaGenerator.kt index e1b5a880..17b6b156 100644 --- a/core/src/main/kotlin/Generation/DokkaGenerator.kt +++ b/core/src/main/kotlin/Generation/DokkaGenerator.kt @@ -86,7 +86,7 @@ class DokkaGenerator(val logger: DokkaLogger, val environment = AnalysisEnvironment(DokkaMessageCollector(logger)) environment.apply { - addClasspath(PathUtil.getJdkClassesRoots()) + addClasspath(PathUtil.getJdkClassesRootsFromCurrentJre()) // addClasspath(PathUtil.getKotlinPathsForCompiler().getRuntimePath()) for (element in this@DokkaGenerator.classpath) { addClasspath(File(element)) @@ -116,7 +116,7 @@ class DokkaMessageCollector(val logger: DokkaLogger) : MessageCollector { private var seenErrors = false - override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { + override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) { if (severity == CompilerMessageSeverity.ERROR) { seenErrors = true } |