From dcb948ea12a7ef3c2515dc621d648baf4c6806d9 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Thu, 16 Feb 2017 16:32:51 +0300
Subject: Updated kotlin compiler to version 1.1.0-rc-84 Version ++ Prepare for
 next development iteration

---
 .idea/kotlinc.xml                                  |   7 +++++++
 .../main/kotlin/Analysis/AnalysisEnvironment.kt    |   4 +++-
 gradle.properties                                  |   4 ++--
 lib/kotlin-compiler.jar                            | Bin 22257475 -> 22544193 bytes
 lib/kotlin-ide-common.jar                          | Bin 445319 -> 449438 bytes
 lib/kotlin-script-runtime.jar                      | Bin 3353 -> 3312 bytes
 lib/markdown.jar                                   | Bin 379275 -> 375565 bytes
 7 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 00000000..1c24f9a8
--- /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 3f7f616f..15d0a26b 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 d0feb72d..8ab2c0a9 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
index e81a8048..cf9a0153 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 c8200fcb..1ce78180 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 96bfa29a..e61fc081 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 eb2c5ab4..6a725fd2 100644
Binary files a/lib/markdown.jar and b/lib/markdown.jar differ
-- 
cgit