Moved Kotlin plugin dependency into 'server' module

Author: fwcd

build.gradle

@@ -8,16 +8,9 @@ buildscript {
 	}
 }
 
-plugins {
-	id 'com.github.jk1.tcdeps' version '0.17' apply false
-}
-
-def rootProjectDir = projectDir
-
 allprojects {
 	apply plugin: 'kotlin'
 	apply plugin: 'maven'
-	apply plugin: 'com.github.jk1.tcdeps'
 
 	sourceCompatibility = 1.8
 	targetCompatibility = 1.8
@@ -28,53 +21,17 @@ allprojects {
 		}
 	}
 
-	repositories {
-		mavenCentral()
-		maven { url 'https://repo.gradle.org/gradle/libs-releases' }
-		teamcityServer {
-			url = teamCityUrl
-			credentials {
-				username = teamCityUsername
-				password = teamCityPassword
-			}
-		}
-	}
-
-	configurations {
-		kotlinJVMLib
-	}
-
 	dependencies {
-		def kotlinTeamCity = "$kotlinBuildType:$kotlinBuild:kotlin-plugin-${kotlinPluginBuild}.zip!/Kotlin"
-
-		implementation "com.google.guava:guava:21.0"
-		implementation "org.gradle:gradle-tooling-api:4.3"
-		implementation "org.eclipse.lsp4j:org.eclipse.lsp4j:0.5.0"
-
-		implementation "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
-		implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
-		kotlinJVMLib tc("$kotlinTeamCity/lib/kotlin-plugin.jar")
-		kotlinJVMLib tc("$kotlinTeamCity/lib/j2k.jar")
-
-		implementation fileTree(dir: "$rootProjectDir/lib", include: ["*.jar"])
-		implementation fileTree(dir: "$rootProjectDir/lib-kotlin", include: ["*.jar"])
-		testImplementation "org.hamcrest:hamcrest-all:1.3"
-		testImplementation "junit:junit:4.10"
-		testImplementation "org.openjdk.jmh:jmh-core:1.20"
+		testImplementation 'org.hamcrest:hamcrest-all:1.3'
+		testImplementation 'junit:junit:4.10'
+		testImplementation 'org.openjdk.jmh:jmh-core:1.20'
 		testImplementation "org.jetbrains.kotlin:kotlin-script-runtime:$kotlinVersion"
-		annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:1.20"
+		annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.20'
 	}
 
 	configurations.all { config ->
 		config.resolutionStrategy {
 			preferProjectModules()
 		}
 	}
-
-	task copyKotlinJVMLib(type: Copy) {
-		from configurations.kotlinJVMLib
-		into "$rootProjectDir/lib-kotlin"
-	}
-
-	compileKotlin.dependsOn copyKotlinJVMLib
 }

server/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'application'
+	id 'com.github.jk1.tcdeps' version '0.17'
 }
 
 group = 'org.javacs'
@@ -11,14 +12,47 @@ description = 'Code completions, diagnostics and more for Kotlin'
 def debugPort = 8000
 def debugArgs = '-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=n,quiet=y'
 
+repositories {
+    maven { url 'https://repo.gradle.org/gradle/libs-releases' }
+    mavenCentral()
+    teamcityServer {
+        url = teamCityUrl
+        credentials {
+            username = teamCityUsername
+            password = teamCityPassword
+        }
+    }
+}
+
+configurations {
+    kotlinJVMLib
+}
+
 dependencies {
+    def kotlinTeamCity = "$kotlinBuildType:$kotlinBuild:kotlin-plugin-${kotlinPluginBuild}.zip!/Kotlin"
+    
     implementation project(':shared')
+    implementation 'com.google.guava:guava:21.0'
+    implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.5.0'
+    implementation "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+    
+    implementation fileTree(dir: "$projectDir/lib", include: ["*.jar"])
+    implementation fileTree(dir: "$projectDir/lib-kotlin", include: ["*.jar"])
+    
+    kotlinJVMLib tc("$kotlinTeamCity/lib/kotlin-plugin.jar")
+    kotlinJVMLib tc("$kotlinTeamCity/lib/j2k.jar")
 }
 
 applicationDistribution.into('bin') {
     fileMode = 0755
 }
 
+task copyKotlinJVMLib(type: Copy) {
+    from configurations.kotlinJVMLib
+    into "$projectDir/lib-kotlin"
+}
+
 task fixFilePermissions(type: Exec) {
     // When running on macOS or Linux the start script
     // needs executable permissions to run.
@@ -59,5 +93,6 @@ test {
     }
 }
 
+compileKotlin.dependsOn copyKotlinJVMLib
 installDist.finalizedBy fixFilePermissions
 build.finalizedBy installDist

lib/fernflower-license.txt renamed to server/lib/fernflower-license.txt

@@ -0,0 +1,9 @@
+repositories {
+    maven { url 'https://repo.gradle.org/gradle/libs-releases' }
+    mavenCentral()
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    implementation 'org.gradle:gradle-tooling-api:4.3'
+}

lib/fernflower.jar renamed to server/lib/fernflower.jar

@@ -6,7 +6,6 @@ import org.javacs.kt.util.winCompatiblePathOf
 import org.javacs.kt.util.tryResolving
 import org.javacs.kt.util.firstNonNull
 import org.javacs.kt.util.KotlinLSException
-import org.jetbrains.kotlin.utils.ifEmpty
 import java.io.File
 import java.io.IOException
 import java.nio.file.Files