Restore kover and run it on CI

Additionally cleanup a bit plugins sections of build scripts

Author: whyoleg

build-logic/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     implementation(libs.kotlin.gradle.plugin)
     implementation(libs.kotlin.allopen.gradle.plugin)
     implementation(libs.kotlin.dokka.gradle.plugin)
+    implementation(libs.kotlinx.kover.gradle.plugin)
     implementation(libs.kotlinx.benchmark.gradle.plugin)
     implementation(libs.android.gradle.plugin)
     implementation(libs.maven.publish.gradle.plugin)

build-logic/src/main/kotlin/ckbuild.multiplatform-provider-tests.gradle.kts

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.targets.jvm.tasks.*
 import org.jetbrains.kotlin.gradle.targets.native.tasks.*
 
 plugins {
-    kotlin("multiplatform")
+    id("ckbuild.multiplatform-tests")
     id("testtool.server")
 }
 
@@ -50,7 +50,10 @@ registerTestAggregationTask(
     name = "jvmAllProviderTest",
     taskDependencies = { tasks.withType<KotlinJvmTest>() },
     targetFilter = { it.platformType == KotlinPlatformType.jvm }
-)
+) {
+    // kover is only supported for JVM tests
+    finalizedBy("koverVerify")
+}
 
 // test only on min and max JDK versions
 registerTestAggregationTask(

build-logic/src/main/kotlin/ckbuild.multiplatform-tests.gradle.kts

@@ -16,6 +16,14 @@ plugins {
     id("ckbuild.multiplatform-base")
 }
 
+// https://github.com/Kotlin/kotlinx-kover/issues/747
+if (project.name != "cryptography-provider-jdk-android-tests") {
+    plugins.apply("org.jetbrains.kotlinx.kover")
+} else {
+    // as we depend on it in the ` jvmAllTest ` task
+    tasks.register("koverVerify")
+}
+
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     // just applying `kotlin-test` doesn't work for JVM if there are multiple test tasks (like when we test on different JDKs)
@@ -73,7 +81,10 @@ registerTestAggregationTask(
     name = "jvmAllTest",
     taskDependencies = { tasks.withType<KotlinJvmTest>() },
     targetFilter = { it.platformType == KotlinPlatformType.jvm }
-)
+) {
+    // kover is only supported for JVM tests
+    finalizedBy("koverVerify")
+}
 
 registerTestAggregationTask(
     name = "nativeTest",
@@ -96,5 +107,5 @@ listOf("ios", "watchos", "tvos", "macos").forEach { targetGroup ->
 }
 
 if (providers.gradleProperty("ckbuild.skipTestTasks").map(String::toBoolean).getOrElse(false)) {
-    tasks.matching { it is AbstractTestTask || it is AndroidTestTask }.configureEach { onlyIf { false } }
+    tasks.matching { it is AbstractTestTask || it is AndroidTestTask || it.name == "koverVerify" }.configureEach { onlyIf { false } }
 }

build-logic/src/main/kotlin/ckbuild/tests/TestAggregation.kt

@@ -13,6 +13,7 @@ fun Project.registerTestAggregationTask(
     name: String,
     taskDependencies: () -> TaskCollection<*>,
     targetFilter: (KotlinTarget) -> Boolean,
+    configure: Task.() -> Unit = {},
 ) {
     extensions.configure<KotlinMultiplatformExtension>("kotlin") {
         var called = false
@@ -23,6 +24,7 @@ fun Project.registerTestAggregationTask(
             tasks.register(name) {
                 group = "verification"
                 dependsOn(taskDependencies())
+                configure()
             }
         }
     }

cryptography-bigint/build.gradle.kts

@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.*
 
 plugins {
     id("ckbuild.multiplatform-library")
-    alias(libs.plugins.kotlin.plugin.serialization)
+    id("org.jetbrains.kotlin.plugin.serialization")
 }
 
 description = "cryptography-kotlin BigInt API"

cryptography-providers/jdk/android-tests/build.gradle.kts

@@ -5,7 +5,6 @@
 import ckbuild.*
 
 plugins {
-    id("ckbuild.multiplatform-tests")
     id("ckbuild.multiplatform-provider-tests")
 }
 

cryptography-providers/openssl3/prebuilt/build.gradle.kts

@@ -12,8 +12,8 @@ import org.jetbrains.kotlin.gradle.tasks.*
 
 plugins {
     id("ckbuild.multiplatform-library")
-    id("ckbuild.use-openssl")
     id("ckbuild.multiplatform-provider-tests")
+    id("ckbuild.use-openssl")
 }
 
 description = "cryptography-kotlin OpenSSL3 provider (prebuilt)"

cryptography-providers/openssl3/shared/build.gradle.kts

@@ -10,8 +10,8 @@ import org.jetbrains.kotlin.konan.target.*
 
 plugins {
     id("ckbuild.multiplatform-library")
-    id("ckbuild.use-openssl")
     id("ckbuild.multiplatform-provider-tests")
+    id("ckbuild.use-openssl")
 }
 
 description = "cryptography-kotlin OpenSSL3 provider (shared)"

cryptography-providers/tests/build.gradle.kts

@@ -7,7 +7,6 @@ import org.jetbrains.kotlin.gradle.*
 
 plugins {
     id("ckbuild.multiplatform-tests")
-
     id("org.jetbrains.kotlin.plugin.serialization")
 }
 

cryptography-serialization/asn1/build.gradle.kts

@@ -6,7 +6,7 @@ import ckbuild.*
 
 plugins {
     id("ckbuild.multiplatform-library")
-    alias(libs.plugins.kotlin.plugin.serialization)
+    id("org.jetbrains.kotlin.plugin.serialization")
 }
 
 description = "cryptography-kotlin ASN.1 (DER) API"