From 4810d07256c86825b85807dd93448279bde5b3b9 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Mon, 26 Jun 2017 15:25:09 +0300 Subject: Update bundled kotlin compiler to 1.1.3 --- .idea/compiler.xml | 20 ++++++++++---------- core/build.gradle | 4 ++-- .../main/kotlin/Analysis/AnalysisEnvironment.kt | 9 ++++----- core/src/main/kotlin/Generation/DokkaGenerator.kt | 4 ++-- core/src/test/kotlin/TestAPI.kt | 3 ++- gradle.properties | 4 ++-- lib/intellij-core-analysis.jar | Bin 40312313 -> 40325875 bytes lib/jdom.jar | Bin 324832 -> 324832 bytes lib/jps-model.jar | Bin 1033099 -> 1033099 bytes lib/kotlin-compiler.jar | Bin 23210095 -> 23983554 bytes lib/kotlin-ide-common.jar | Bin 454987 -> 458483 bytes lib/kotlin-script-runtime.jar | Bin 18356 -> 18188 bytes lib/markdown.jar | Bin 374889 -> 388387 bytes lib/picocontainer.jar | Bin 231869 -> 231869 bytes lib/protobuf-2.5.0-lite.jar | Bin 110159 -> 0 bytes lib/protobuf-2.6.1-lite.jar | Bin 0 -> 128427 bytes lib/trove4j.jar | Bin 1172429 -> 1172429 bytes runners/android-gradle-plugin/build.gradle | 2 +- runners/ant/build.gradle | 2 +- runners/cli/build.gradle | 2 +- runners/gradle-plugin/build.gradle | 2 +- 21 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 lib/protobuf-2.5.0-lite.jar create mode 100644 lib/protobuf-2.6.1-lite.jar diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 634de1d7..56269ff5 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -20,22 +20,22 @@ - - - - + + + + - - - - + + + + - - + + diff --git a/core/build.gradle b/core/build.gradle index 274ea466..12d9754a 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -8,7 +8,7 @@ buildscript { apply plugin: 'kotlin' -sourceCompatibility = 1.5 +sourceCompatibility = 1.6 configurations { provided @@ -40,7 +40,7 @@ dependencies { runtime files("../lib/trove4j.jar") runtime files("../lib/jdom.jar") - runtime files("../lib/protobuf-2.5.0-lite.jar") + runtime files("../lib/protobuf-2.6.1-lite.jar") runtime files("../lib/asm-all.jar") runtime files("../lib/jps-model.jar") 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 } diff --git a/core/src/test/kotlin/TestAPI.kt b/core/src/test/kotlin/TestAPI.kt index 4799cd93..7141b731 100644 --- a/core/src/test/kotlin/TestAPI.kt +++ b/core/src/test/kotlin/TestAPI.kt @@ -56,8 +56,9 @@ fun appendDocumentation(documentation: DocumentationModule, } - override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { + override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) { when (severity) { + CompilerMessageSeverity.STRONG_WARNING, CompilerMessageSeverity.WARNING, CompilerMessageSeverity.LOGGING, CompilerMessageSeverity.OUTPUT, diff --git a/gradle.properties b/gradle.properties index 120295a9..3efea075 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ dokka_version=0.9.15 dokka_publication_channel=dokka #Kotlin compiler and plugin -kotlin_version=1.1.2 -kotlin_for_gradle_version=1.0.6 +kotlin_version=1.1.3 +kotlin_for_gradle_version=1.0.7 ant_version=1.9.6 diff --git a/lib/intellij-core-analysis.jar b/lib/intellij-core-analysis.jar index 38ddc95b..50520e0c 100644 Binary files a/lib/intellij-core-analysis.jar and b/lib/intellij-core-analysis.jar differ diff --git a/lib/jdom.jar b/lib/jdom.jar index b16dbde2..b913774f 100644 Binary files a/lib/jdom.jar and b/lib/jdom.jar differ diff --git a/lib/jps-model.jar b/lib/jps-model.jar index 538031e0..5467975d 100644 Binary files a/lib/jps-model.jar and b/lib/jps-model.jar differ diff --git a/lib/kotlin-compiler.jar b/lib/kotlin-compiler.jar index 3a7427b2..dec622b1 100644 Binary files a/lib/kotlin-compiler.jar and b/lib/kotlin-compiler.jar differ diff --git a/lib/kotlin-ide-common.jar b/lib/kotlin-ide-common.jar index 458b7646..943e221e 100644 Binary files a/lib/kotlin-ide-common.jar and b/lib/kotlin-ide-common.jar differ diff --git a/lib/kotlin-script-runtime.jar b/lib/kotlin-script-runtime.jar index 2b4ab1f0..e812e248 100644 Binary files a/lib/kotlin-script-runtime.jar and b/lib/kotlin-script-runtime.jar differ diff --git a/lib/markdown.jar b/lib/markdown.jar index 683cc22f..d0b2639b 100644 Binary files a/lib/markdown.jar and b/lib/markdown.jar differ diff --git a/lib/picocontainer.jar b/lib/picocontainer.jar index b0f0f56b..b9e5819d 100644 Binary files a/lib/picocontainer.jar and b/lib/picocontainer.jar differ diff --git a/lib/protobuf-2.5.0-lite.jar b/lib/protobuf-2.5.0-lite.jar deleted file mode 100644 index a0819eb6..00000000 Binary files a/lib/protobuf-2.5.0-lite.jar and /dev/null differ diff --git a/lib/protobuf-2.6.1-lite.jar b/lib/protobuf-2.6.1-lite.jar new file mode 100644 index 00000000..f1028780 Binary files /dev/null and b/lib/protobuf-2.6.1-lite.jar differ diff --git a/lib/trove4j.jar b/lib/trove4j.jar index a02528f1..26df1466 100644 Binary files a/lib/trove4j.jar and b/lib/trove4j.jar differ diff --git a/runners/android-gradle-plugin/build.gradle b/runners/android-gradle-plugin/build.gradle index a1747619..7c2eaa14 100644 --- a/runners/android-gradle-plugin/build.gradle +++ b/runners/android-gradle-plugin/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'java' apply plugin: 'kotlin' -sourceCompatibility = 1.6 +sourceCompatibility = 1.8 apply plugin: 'com.github.johnrengelman.shadow' apply plugin: "com.gradle.plugin-publish" diff --git a/runners/ant/build.gradle b/runners/ant/build.gradle index 20fc034d..2622ce6e 100644 --- a/runners/ant/build.gradle +++ b/runners/ant/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'kotlin' -sourceCompatibility = 1.5 +sourceCompatibility = 1.6 configurations { provided diff --git a/runners/cli/build.gradle b/runners/cli/build.gradle index 2fa2752f..a1d9d4d6 100644 --- a/runners/cli/build.gradle +++ b/runners/cli/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'kotlin' -sourceCompatibility = 1.5 +sourceCompatibility = 1.6 dependencies { compile project(":core") diff --git a/runners/gradle-plugin/build.gradle b/runners/gradle-plugin/build.gradle index dbb3d72a..1848570a 100644 --- a/runners/gradle-plugin/build.gradle +++ b/runners/gradle-plugin/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'java' apply plugin: 'kotlin' -sourceCompatibility = 1.6 +sourceCompatibility = 1.8 apply plugin: 'com.github.johnrengelman.shadow' apply plugin: "com.gradle.plugin-publish" -- cgit