Clean up dependencies and use bintray repo for Kotlin plugin

Author: fwcd

build.gradle

@@ -2,8 +2,11 @@ plugins {
     id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion"
 }
 
-repositories {
-    mavenCentral()
+allprojects {
+    repositories {
+        mavenCentral()
+        maven { url 'https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-plugin' }
+    }
 }
 
 configure(subprojects.findAll { it.name != 'grammars' }) {

gradle.properties

@@ -1,8 +1,2 @@
 projectVersion=0.7.0
-teamCityUrl=https://teamcity.jetbrains.com
-teamCityUsername=guest
-teamCityPassword=guest
-kotlinVersion=1.4.0
-kotlinBuildType=Kotlin_1400_CompilerAllPlugins
-kotlinBuild=1.4.0
-kotlinPluginBuild=
+kotlinVersion=1.4.20-release-327

server/build.gradle

@@ -22,50 +22,29 @@ startScripts {
 }
 
 repositories {
-    maven { url 'https://repo.gradle.org/gradle/libs-releases' }
     maven { url uri("$projectDir/lib") }
-    mavenCentral()
-    teamcityServer {
-        url = teamCityUrl
-        credentials {
-            username = teamCityUsername
-            password = teamCityPassword
-        }
-    }
-}
-
-configurations {
-    kotlinJVMLib
 }
 
 dependencies {
-    def kotlinPluginTC = "$kotlinBuildType:$kotlinBuild:kotlin-plugin-${kotlinPluginBuild}.zip!/Kotlin"
-
     implementation project(':shared')
     implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.7.0'
     implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.7.0'
-    implementation 'org.jetbrains.kotlin:kotlin-compiler'
-    implementation 'org.jetbrains.kotlin:kotlin-scripting-compiler'
-    implementation 'org.jetbrains.kotlin:kotlin-scripting-compiler-impl'
-    implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm-host-unshaded'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect'
+    implementation "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-scripting-compiler:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-scripting-compiler-impl:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:ide-common-ij201:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-scripting-jvm-host-unshaded:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
     implementation 'org.jetbrains:fernflower:1.0'
     implementation 'com.beust:jcommander:1.78'
 
-    // Re-add to depend on Kotlin plugin classes directly. Note that
-    // this plugin uses the normal imports (com.intellij.*)
-    // instead of the embedded ones (org.jetbrains.kotlin.com.intellij.*)
-    // as used by kotlin-compiler-embeddable, ktlint, etc.
-
-    // kotlinJVMLib tc("$kotlinPluginTC/lib/kotlin-plugin.jar")
-
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
     testImplementation 'junit:junit:4.11'
     testImplementation 'org.openjdk.jmh:jmh-core:1.20'
 
     // See https://github.com/JetBrains/kotlin/blob/65b0a5f90328f4b9addd3a10c6f24f3037482276/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts#L8
-    compileOnly 'org.jetbrains.kotlin:kotlin-scripting-jvm-host'
-    testCompileOnly 'org.jetbrains.kotlin:kotlin-scripting-jvm-host'
+    compileOnly "org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion"
+    testCompileOnly "org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion"
 
     annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.20'
 }
@@ -86,11 +65,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     }
 }
 
-task copyKotlinJVMLib(type: Sync) {
-    from configurations.kotlinJVMLib
-    into file('lib-kotlin')
-}
-
 task copyPropertiesToTestWorkspace(type: Copy) {
     from "$rootDir/gradle.properties"
     into file('src/test/resources/additionalWorkspace')
@@ -149,6 +123,5 @@ distZip {
     archiveFileName = "${project.name}.zip"
 }
 
-compileKotlin.dependsOn copyKotlinJVMLib
 installDist.finalizedBy fixFilePermissions
 build.finalizedBy installDist

server/src/main/kotlin/org/javacs/kt/formatting/Formatter.kt

@@ -1,5 +1,6 @@
 package org.javacs.kt.formatting
 
+// import com.intellij.formatting.FormatterImpl
 import org.eclipse.lsp4j.FormattingOptions
 
 fun formatKotlinCode(

settings.gradle

@@ -1,3 +1,10 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven { url 'https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-plugin' }
+    }
+}
+
 rootProject.name = 'kotlin-language-server'
 
 include(

shared/build.gradle

@@ -8,11 +8,6 @@ version = projectVersion
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-repositories {
-    maven { url 'https://repo.gradle.org/gradle/libs-releases' }
-    mavenCentral()
-}
-
 dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
     testImplementation 'org.hamcrest:hamcrest-all:1.3'