diff options
| author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-02-16 16:32:51 +0300 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-02-16 16:32:51 +0300 |
| commit | dcb948ea12a7ef3c2515dc621d648baf4c6806d9 (patch) | |
| tree | a3253903d9a3844df169a585527421e3686c1e4c | |
| parent | f4f7642c90fef06f04cadc57835ed431ace69802 (diff) | |
| download | dokka-dcb948ea12a7ef3c2515dc621d648baf4c6806d9.tar.gz | |
Updated kotlin compiler to version 1.1.0-rc-84
Version ++
Prepare for next development iteration
| -rw-r--r-- | .idea/kotlinc.xml | 7 | ||||
| -rw-r--r-- | core/src/main/kotlin/Analysis/AnalysisEnvironment.kt | 4 | ||||
| -rw-r--r-- | gradle.properties | 4 | ||||
| -rw-r--r-- | lib/kotlin-compiler.jar | bin | 22257475 -> 22544193 bytes | |||
| -rw-r--r-- | lib/kotlin-ide-common.jar | bin | 445319 -> 449438 bytes | |||
| -rw-r--r-- | lib/kotlin-script-runtime.jar | bin | 3353 -> 3312 bytes | |||
| -rw-r--r-- | lib/markdown.jar | bin | 379275 -> 375565 bytes |
7 files changed, 12 insertions, 3 deletions
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 000000000..1c24f9a8d --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="KotlinCommonCompilerArguments"> + <option name="languageVersion" value="1.1" /> + <option name="apiVersion" value="1.1" /> + </component> +</project>
\ No newline at end of file diff --git a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt index 3f7f616f1..15d0a26ba 100644 --- a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt +++ b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt @@ -38,6 +38,7 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.CompilerEnvironment +import org.jetbrains.kotlin.resolve.MultiTargetPlatform import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM @@ -133,7 +134,8 @@ class AnalysisEnvironment(val messageCollector: MessageCollector) : Disposable { info, content -> JvmPackagePartProvider(environment, content.moduleContentScope) }, - builtIns = builtIns + builtIns = { builtIns }, + modulePlatforms = { MultiTargetPlatform.Specific("JVM") } ) resolverForProject.resolverForModule(library) // Required before module to initialize library properly diff --git a/gradle.properties b/gradle.properties index d0feb72d6..8ab2c0a94 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ -dokka_version=0.9.13 +dokka_version=0.9.14 dokka_publication_channel=dokka #Kotlin compiler and plugin -kotlin_version=1.1-M04 +kotlin_version=1.1.0-rc-84 kotlin_for_gradle_version=1.0.6 ant_version=1.9.6 diff --git a/lib/kotlin-compiler.jar b/lib/kotlin-compiler.jar Binary files differindex e81a80480..cf9a01536 100644 --- a/lib/kotlin-compiler.jar +++ b/lib/kotlin-compiler.jar diff --git a/lib/kotlin-ide-common.jar b/lib/kotlin-ide-common.jar Binary files differindex c8200fcb6..1ce78180b 100644 --- a/lib/kotlin-ide-common.jar +++ b/lib/kotlin-ide-common.jar diff --git a/lib/kotlin-script-runtime.jar b/lib/kotlin-script-runtime.jar Binary files differindex 96bfa29a1..e61fc0813 100644 --- a/lib/kotlin-script-runtime.jar +++ b/lib/kotlin-script-runtime.jar diff --git a/lib/markdown.jar b/lib/markdown.jar Binary files differindex eb2c5ab4e..6a725fd26 100644 --- a/lib/markdown.jar +++ b/lib/markdown.jar |