Factor out a Kotlin convention plugin for the toolchain

Author: fwcd

buildSrc/build.gradle.kts

@@ -4,4 +4,15 @@ plugins {
 
 repositories {
     mavenCentral()
+    gradlePluginPortal()
+}
+
+// Use JDK 11 for compiling the convention plugins (this is NOT the project!)
+
+kotlin {
+    jvmToolchain(11)
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
 }

buildSrc/settings.gradle.kts

@@ -1,5 +1 @@
-dependencyResolutionManagement {
-    repositories {
-        gradlePluginPortal()
-    }
-}
+rootProject.name = "build-conventions"

buildSrc/src/main/kotlin/kotlin-language-server.kotlin-conventions.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    kotlin("jvm")
+}
+
+val javaVersion = property("javaVersion").toString()
+
+kotlin {
+    jvmToolchain(javaVersion.toInt())
+}

buildSrc/src/main/kotlin/kotlin-language-server.configure-publishing.gradle.kts renamed to buildSrc/src/main/kotlin/kotlin-language-server.publishing-conventions.gradle.kts

@@ -0,0 +1,2 @@
+version=1.3.2
+javaVersion=11

gradle.properties

@@ -61,7 +61,7 @@ def git_working_dir_is_clean(repo_path):
 }
 EDITOR = os.environ.get("EDITOR", "vim") # https://stackoverflow.com/questions/6309587/call-up-an-editor-vim-from-a-python-script
 PROJECT_DIR = Path(__file__).parent.parent
-PROJECT_VERSION_KEY = "projectVersion"
+PROJECT_VERSION_KEY = "version"
 
 def main():
     parser = argparse.ArgumentParser(description="A small utility for updating the project's version and creating tags.")

scripts/release_version.py

@@ -6,27 +6,20 @@ plugins {
     id("application")
     id("com.github.jk1.tcdeps")
     id("com.jaredsburrows.license")
-    id("kotlin-language-server.configure-publishing")
+    id("kotlin-language-server.publishing-conventions")
+    id("kotlin-language-server.kotlin-conventions")
 }
 
-val projectVersion = "1.3.2"
 val debugPort = 8000
 val debugArgs = "-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=n,quiet=y"
-val javaVersion = try {
-    project.property("javaVersion").toString()
-} catch (_: MissingPropertyException) {
-    "11"
-}
-
-version = projectVersion
 
 val serverMainClassName = "org.javacs.kt.MainKt"
 val applicationName = "kotlin-language-server"
 
 application {
     mainClass.set(serverMainClassName)
     description = "Code completions, diagnostics and more for Kotlin"
-    applicationDefaultJvmArgs = listOf("-DkotlinLanguageServer.version=$projectVersion")
+    applicationDefaultJvmArgs = listOf("-DkotlinLanguageServer.version=$version")
     applicationDistribution.into("bin") {
         fileMode = 755
     }
@@ -84,12 +77,6 @@ tasks.startScripts {
     applicationName = "kotlin-language-server"
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = javaVersion
-    }
-}
-
 tasks.register<Exec>("fixFilePermissions") {
     // When running on macOS or Linux the start script
     // needs executable permissions to run.

server/build.gradle.kts

@@ -3,28 +3,14 @@ import groovy.lang.MissingPropertyException
 plugins {
     id("maven-publish")
     kotlin("jvm")
-    id("configure-publishing")
+    id("kotlin-language-server.publishing-conventions")
+    id("kotlin-language-server.kotlin-conventions")
 }
 
 repositories {
     mavenCentral()
 }
 
-version = project.version
-val javaVersion = try {
-    project.property("javaVersion").toString()
-} catch (_: MissingPropertyException) {
-    "11"
-}
-
-java {
-    toolchain {
-        languageVersion.set(
-            JavaLanguageVersion.of(javaVersion)
-        )
-    }
-}
-
 dependencies {
     // dependencies are constrained to versions defined
     // in /gradle/platform/build.gradle.kts