aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/kotlin/Generation
diff options
context:
space:
mode:
authorSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2017-06-26 15:25:09 +0300
committerSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2017-06-26 15:25:09 +0300
commit4810d07256c86825b85807dd93448279bde5b3b9 (patch)
treed7cc5162acdbea196e3c086a3d43d3ed6fa688a8 /core/src/main/kotlin/Generation
parent1121071276ca2ce0afeabf4d3e540d4d8103f311 (diff)
downloaddokka-4810d07256c86825b85807dd93448279bde5b3b9.tar.gz
dokka-4810d07256c86825b85807dd93448279bde5b3b9.tar.bz2
dokka-4810d07256c86825b85807dd93448279bde5b3b9.zip
Update bundled kotlin compiler to 1.1.3
Diffstat (limited to 'core/src/main/kotlin/Generation')
-rw-r--r--core/src/main/kotlin/Generation/DokkaGenerator.kt4
1 files changed, 2 insertions, 2 deletions
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
}