Updated to Kotlin 1.2.50

Author: fwcd

build.gradle

@@ -1,12 +1,10 @@
 buildscript {
-	ext.kotlin_version = '1.2.31'
-
 	repositories {
 		mavenCentral()
 	}
 
 	dependencies {
-		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 	}
 }
 
@@ -18,7 +16,7 @@ group = 'org.javacs'
 version = '0.1.1'
 
 mainClassName = "org.javacs.kt.MainKt"
-description = "kotlin-language-server"
+description = "Code completions, diagnostics and more for Kotlin"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -38,13 +36,13 @@ dependencies {
 	implementation "com.google.guava:guava:21.0"
 	implementation "org.gradle:gradle-tooling-api:4.3"
 	implementation "org.eclipse.lsp4j:org.eclipse.lsp4j:0.4.1"
-	implementation "org.jetbrains.kotlin:kotlin-stdlib:1.2.31"
-	implementation "org.jetbrains.kotlin:kotlin-compiler:1.2.31"
+	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+	implementation "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
 	implementation fileTree(dir: "lib", include: ["*.jar"])
-	testImplementation "org.openjdk.jmh:jmh-core:1.20"
 	testImplementation "org.hamcrest:hamcrest-all:1.3"
 	testImplementation "junit:junit:4.10"
-	compileOnly "org.openjdk.jmh:jmh-generator-annprocess:1.20"
+	testImplementation "org.openjdk.jmh:jmh-core:1.20"
+	annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:1.20"
 }
 
 configurations.all { config ->

gradle.properties

@@ -0,0 +1 @@
+kotlinVersion=1.2.50

src/main/kotlin/org/javacs/kt/Compiler.kt

@@ -5,7 +5,7 @@ import com.intellij.openapi.vfs.StandardFileSystems
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.psi.PsiFileFactory
 import org.jetbrains.kotlin.cli.common.script.CliScriptDefinitionProvider
-import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport.CliBindingTrace
+import org.jetbrains.kotlin.cli.jvm.compiler.CliBindingTrace
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM

src/test/java/org/javacs/kt/OneFilePerformance.java

@@ -7,7 +7,7 @@
 import com.intellij.openapi.vfs.VirtualFileSystem;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.util.PsiTreeUtil;
-import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport;
+import org.jetbrains.kotlin.cli.jvm.compiler.CliBindingTrace;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
 import org.jetbrains.kotlin.config.CommonConfigurationKeys;
@@ -64,7 +64,7 @@ KtFile openFile(String resourcePath) {
         }
 
         BindingTraceContext compile(Collection<KtFile> compile, Collection<KtFile> sourcePath) {
-            BindingTraceContext trace = new CliLightClassGenerationSupport.CliBindingTrace();
+            BindingTraceContext trace = new CliBindingTrace();
             new ComponentProvider(){
 
                 @Override