Merge pull request #458 from fwcd/convention-plugins

Update to Gradle 8 and migrate to convention plugins

Author: fwcd

.github/workflows/build.yml

@@ -26,4 +26,4 @@ jobs:
       - name: Build
         run: ./gradlew :server:build :shared:build -PjavaVersion=${{ matrix.java }}
       - name: Detekt
-        run: ./gradlew detekt
+        run: ./gradlew detekt -PjavaVersion=${{ matrix.java }}

build.gradle.kts

@@ -41,13 +41,12 @@ tasks.register<DetektCreateBaselineTask>("createDetektBaseline") {
     baseline.set(file("$rootDir/detekt_baseline.xml"))
     include("**/*.kt")
     include("**/*.kts")
-    exclude("shared/build/**/*.*")
-    exclude("server/build/**/*.*")
-    exclude("gradle/plugins/build/**/*.*")
+    exclude("**/build/**")
 }
 
 tasks.withType<Detekt>().configureEach {
     jvmTarget = JavaVersion.VERSION_11.toString()
+    exclude("**/build/**")
     reports {
         html.required.set(true)
         md.required.set(true)

buildSrc/build.gradle.kts

@@ -0,0 +1,34 @@
+import java.util.Properties
+import groovy.lang.MissingPropertyException
+
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+// Use the same Java version for compiling the convention plugins as for the main project
+// For this we need to manually load the gradle.properties, since variables from the main
+// project are generally not visible from buildSrc.
+
+val javaVersionProperty = "javaVersion"
+val javaVersion = try {
+    project.property(javaVersionProperty) as String
+} catch (e: MissingPropertyException) {
+    Properties().also { properties ->
+        File("$rootDir/../gradle.properties").inputStream().use { stream ->
+            properties.load(stream)
+        }
+    }[javaVersionProperty] as String
+}
+
+kotlin {
+    jvmToolchain(javaVersion.toInt())
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
+}

buildSrc/settings.gradle.kts

@@ -0,0 +1 @@
+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") as String
+
+kotlin {
+    jvmToolchain(javaVersion.toInt())
+}

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

@@ -1,3 +1,12 @@
 config:
   validation: true # verifies that this config file is valid
   warningsAsErrors: false
+
+exceptions:
+  SwallowedException:
+    ignoredExceptionTypes:
+      - InterruptedException
+      - MalformedURLException
+      - NumberFormatException
+      - ParseException
+      - MissingPropertyException

detekt.yml

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