fix: plugin update (kover) and version pins

Author: sgammon

build.gradle.kts

@@ -64,16 +64,8 @@ sonarqube {
     }
 }
 
-koverMerged {
-    enable()
-
-    xmlReport {
-        onCheck.set(isCI)
-    }
-
-    htmlReport {
-        onCheck.set(isCI)
-    }
+koverReport {
+    // nothing
 }
 
 subprojects {
@@ -163,15 +155,15 @@ tasks.register("preMerge") {
     description = "Runs all the tests/verification tasks on both top level and included build."
 
     dependsOn("build", "test", "check")
-    dependsOn("koverReport", "koverVerify", "koverMergedXmlReport")
+    dependsOn("koverVerify", "koverXmlReport")
 
     if ((properties["buildExamples"] as? String) == "true") {
         dependsOn(":example:fullstack:node:check")
         dependsOn(":example:fullstack:server:check")
     }
     dependsOn(gradle.includedBuild("plugin-build").task(":plugin:check"))
     dependsOn(gradle.includedBuild("plugin-build").task(":plugin:validatePlugins"))
-    dependsOn(gradle.includedBuild("plugin-build").task(":plugin:koverReport"))
+    dependsOn(gradle.includedBuild("plugin-build").task(":plugin:koverXmlReport"))
     dependsOn(gradle.includedBuild("plugin-build").task(":plugin:koverVerify"))
 }
 

gradle/libs.versions.toml

@@ -18,7 +18,7 @@ pluginPublish = "0.21.0"
 pluginProtobuf = "0.9.2"
 versionCheck = "0.46.0"
 nodePlugin = "3.5.1"
-sonar = "3.5.0.2730"
+sonar = "4.0.0.2929"
 protobuf = "3.21.11"
 truth = "1.1.3"
 picocli = "4.7.1"
@@ -36,7 +36,7 @@ closure = "v20230103"
 closure_stylesheets = "1.5.0"
 buildconfig_plugin = "3.1.0"
 auto_service = "1.0.1"
-kover = "0.6.1"
+kover = "0.7.0-Beta"
 testLoggerPlugin = "3.2.0"
 
 micronaut = "3.9.1"
@@ -139,7 +139,12 @@ elide_kotlin_plugin_interakt = { group = "dev.elide", name = "kotlin-interakt-pl
 elide_kotlin_plugin_redakt = { group = "dev.elide", name = "kotlin-redakt-plugin", version.ref = "elide" }
 elide_kotlin_plugin_sekret = { group = "dev.elide", name = "kotlin-sekret-plugin", version.ref = "elide" }
 
+plugin_kover = { group = "org.jetbrains.kotlinx", name = "kover-gradle-plugin", version.ref = "kover" }
+plugin_detekt = { group = "io.gitlab.arturbosch.detekt", name = "detekt-gradle-plugin", version.ref = "detekt" }
 plugin_node = { group = "com.github.node-gradle", name = "gradle-node-plugin", version.ref = "nodePlugin" }
+plugin_sonar = { group = "org.sonarsource.scanner.gradle", name = "sonarqube-gradle-plugin", version.ref = "sonar" }
+plugin_versionCheck = { group = "com.github.ben-manes", name = "gradle-versions-plugin", version.ref = "versionCheck" }
+plugin_testLogger = { group = "com.adarshr", name = "gradle-test-logger-plugin", version.ref = "testLoggerPlugin" }
 plugin_buildConfig = { group = "com.github.gmazzo", name = "gradle-buildconfig-plugin", version.ref = "buildconfig_plugin" }
 plugin_kotlin_allopen = { group = "org.jetbrains.kotlin", name = "kotlin-allopen", version.ref = "kotlin" }
 plugin_kotlin_noarg = { group = "org.jetbrains.kotlin", name = "kotlin-noarg", version.ref = "kotlin" }

plugin-build/build.gradle.kts

@@ -25,16 +25,8 @@ apiValidation {
     )
 }
 
-koverMerged {
-    enable()
-
-    xmlReport {
-        onCheck.set(isCI)
-    }
-
-    htmlReport {
-        onCheck.set(isCI)
-    }
+dependencies {
+    kover(project(":plugin"))
 }
 
 allprojects {

plugin-build/buildSrc/build.gradle.kts

@@ -13,8 +13,13 @@ dependencies {
     api(kotlin("gradle-plugin"))
     api(libs.plugin.kotlin.allopen)
     api(libs.plugin.kotlin.noarg)
+    api(libs.plugin.kover)
+    api(libs.plugin.detekt)
+    api(libs.plugin.sonar)
+    api(libs.plugin.testLogger)
+    api(libs.plugin.buildConfig)
+    api(libs.plugin.versionCheck)
     implementation(libs.plugin.kotlinx.serialization)
-    implementation(libs.elide.tools.conventions)
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }

plugin-build/plugin/build.gradle.kts

@@ -180,6 +180,10 @@ sourceSets {
     }
 }
 
+koverReport {
+    // Nothing.
+}
+
 val embedded: Configuration by configurations.creating
 val implementation: Configuration by configurations.getting
 
@@ -266,6 +270,7 @@ java {
 
 kotlin {
     explicitApi()
+    jvmToolchain(11)
 
     sourceSets.all {
         languageSettings.apply {
@@ -278,13 +283,21 @@ kotlin {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
-        apiVersion = Elide.kotlinLanguage
-        languageVersion = Elide.kotlinLanguage
-        jvmTarget = baseJavaMin.toString()
+        apiVersion = "1.8"
+        languageVersion = "1.8"
+        jvmTarget = "11"
         javaParameters = true
-        freeCompilerArgs = Elide.kaptCompilerArgs
         allWarningsAsErrors = true
         incremental = true
+        freeCompilerArgs = listOf(
+            "-progressive",
+            "-Xcontext-receivers",
+            "-no-stdlib",
+            "-Xallow-unstable-dependencies",
+            "-Xemit-jvm-type-annotations",
+            "-Xjvm-default=all",
+            "-Xjsr305=strict",
+        )
     }
 }
 
@@ -390,7 +403,7 @@ tasks.named("check").configure {
     dependsOn("test")
     dependsOn("detekt")
     dependsOn("ktlintCheck")
-    dependsOn("koverReport")
+//    dependsOn("koverReportXml")
     dependsOn("koverVerify")
 }