Use jacoco for kover, create Kover convention plugin

egorikftp · egorikftp · commit 1a72da868f6d · 2025-06-18T11:12:02.000+03:00
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -7,6 +7,7 @@ group = "io.github.composegears.valkyrie"
 dependencies {
     compileOnly(libs.kotlin.compose.compiler.plugin)
     compileOnly(libs.kotlin.gradle.plugin)
+    compileOnly(libs.kover.plugin)
 }
 
 gradlePlugin {
@@ -23,5 +24,9 @@ gradlePlugin {
             id = "valkyrie.wasm.resources"
             implementationClass = "WasmResourcesPlugin"
         }
+        register("valkyrie.kover") {
+            id = "valkyrie.kover"
+            implementationClass = "KoverPlugin"
+        }
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/ComposePlugin.kt b/build-logic/convention/src/main/kotlin/ComposePlugin.kt
@@ -1,4 +1,3 @@
-
 import io.github.composegears.valkyrie.internal.composeCompiler
 import io.github.composegears.valkyrie.internal.jetbrainsComposePluginId
 import io.github.composegears.valkyrie.internal.kotlinComposePluginId
diff --git a/build-logic/convention/src/main/kotlin/KoverPlugin.kt b/build-logic/convention/src/main/kotlin/KoverPlugin.kt
@@ -0,0 +1,16 @@
+import io.github.composegears.valkyrie.internal.kover
+import io.github.composegears.valkyrie.internal.koverPluginId
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
+
+class KoverPlugin : Plugin<Project> {
+
+    override fun apply(target: Project) = with(target) {
+        apply(plugin = koverPluginId)
+
+        kover {
+            useJacoco(libs.versions.jacoco.get())
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/io/github/composegears/valkyrie/internal/Plugins.kt b/build-logic/convention/src/main/kotlin/io/github/composegears/valkyrie/internal/Plugins.kt
@@ -11,3 +11,6 @@ internal val Project.jetbrainsComposePluginId
 
 internal val Project.kotlinComposePluginId
     get() = libs.plugins.kotlin.compose.get().pluginId
+
+internal val Project.koverPluginId
+    get() = libs.plugins.kover.get().pluginId
diff --git a/build-logic/convention/src/main/kotlin/io/github/composegears/valkyrie/internal/Project.kt b/build-logic/convention/src/main/kotlin/io/github/composegears/valkyrie/internal/Project.kt
@@ -1,12 +1,16 @@
 package io.github.composegears.valkyrie.internal
 
+import kotlinx.kover.gradle.plugin.dsl.KoverProjectExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
-import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 internal fun Project.kmpExtension(action: KotlinMultiplatformExtension.() -> Unit) =
     extensions.configure<KotlinMultiplatformExtension>(action)
 
-fun Project.composeCompiler(block: ComposeCompilerGradlePluginExtension.() -> Unit) =
+internal fun Project.composeCompiler(block: ComposeCompilerGradlePluginExtension.() -> Unit) =
     extensions.configure<ComposeCompilerGradlePluginExtension>(block)
+
+internal fun Project.kover(action: KoverProjectExtension.() -> Unit) =
+    extensions.configure<KoverProjectExtension>(action)
diff --git a/components/generator/core/build.gradle.kts b/components/generator/core/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.valkyrie.kmp)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 kotlin {
diff --git a/components/generator/iconpack/build.gradle.kts b/components/generator/iconpack/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     alias(libs.plugins.valkyrie.kmp)
     alias(libs.plugins.valkyrie.wasm.resources)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 kotlin {
diff --git a/components/generator/jvm/imagevector/build.gradle.kts b/components/generator/jvm/imagevector/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 sourceSets {
diff --git a/components/generator/jvm/poet-extensions/build.gradle.kts b/components/generator/jvm/poet-extensions/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 dependencies {
diff --git a/components/ir/build.gradle.kts b/components/ir/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.valkyrie.kmp)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 kotlin {
diff --git a/components/parser/common/build.gradle.kts b/components/parser/common/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.valkyrie.kmp)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 kotlin {
diff --git a/components/parser/jvm/svg/build.gradle.kts b/components/parser/jvm/svg/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 dependencies {
diff --git a/components/parser/jvm/xml/build.gradle.kts b/components/parser/jvm/xml/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 dependencies {
diff --git a/components/parser/kmp/xml/build.gradle.kts b/components/parser/kmp/xml/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.valkyrie.kmp)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
     alias(libs.plugins.kotlin.serialization)
 }
 
diff --git a/components/parser/unified/build.gradle.kts b/components/parser/unified/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     alias(libs.plugins.valkyrie.kmp)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 kotlin {
diff --git a/components/psi/iconpack/build.gradle.kts b/components/psi/iconpack/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.jetbrains.intellij.module)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 dependencies {
diff --git a/components/psi/imagevector/build.gradle.kts b/components/psi/imagevector/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.valkyrie.compose)
     alias(libs.plugins.jetbrains.intellij.module)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 sourceSets {
diff --git a/components/test/coverage/build.gradle.kts b/components/test/coverage/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
 }
 
 dependencies {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,9 @@
 [versions]
 compose = "1.8.1"
 intellij = "2.6.0"
+jacoco = "0.8.13"
 kotlin = "2.2.0-RC3"
+kover = "0.9.1"
 
 [libraries]
 android-build-tools = "com.android.tools:sdk-common:31.10.1"
@@ -31,14 +33,15 @@ composeRules = "io.nlopez.compose.rules:ktlint:0.4.22"
 # Dependencies for build-logic module
 kotlin-compose-compiler-plugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+kover-plugin = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kover" }
 
 [plugins]
 compose-hot-reload = "org.jetbrains.compose.hot-reload:1.0.0-alpha11"
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-kover = "org.jetbrains.kotlinx.kover:0.9.1"
+kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
 jetbrains-bcv = "org.jetbrains.kotlinx.binary-compatibility-validator:0.17.0"
 jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 jetbrains-intellij = { id = "org.jetbrains.intellij.platform", version.ref = "intellij" }
@@ -51,6 +54,7 @@ spotless = "com.diffplug.spotless:7.0.4"
 valkyrie-kmp = { id = "valkyrie.kmp" }
 valkyrie-compose = { id = "valkyrie.compose" }
 valkyrie-wasm-resources = { id = "valkyrie.wasm.resources" }
+valkyrie-kover = { id = "valkyrie.kover" }
 
 [bundles]
 test = ["junit5-jupiter", "assertk"]
diff --git a/tools/cli/build.gradle.kts b/tools/cli/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.buildConfig)
     alias(libs.plugins.shadow)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.valkyrie.kover)
     application
 }
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ group = "io.github.composegears.valkyrie"`
`7`	`7`	`dependencies {`
`8`	`8`	`compileOnly(libs.kotlin.compose.compiler.plugin)`
`9`	`9`	`compileOnly(libs.kotlin.gradle.plugin)`
	`10`	`+ compileOnly(libs.kover.plugin)`
`10`	`11`	`}`
`11`	`12`
`12`	`13`	`gradlePlugin {`
`@@ -23,5 +24,9 @@ gradlePlugin {`
`23`	`24`	`id = "valkyrie.wasm.resources"`
`24`	`25`	`implementationClass = "WasmResourcesPlugin"`
`25`	`26`	`}`
	`27`	`+ register("valkyrie.kover") {`
	`28`	`+ id = "valkyrie.kover"`
	`29`	`+ implementationClass = "KoverPlugin"`
	`30`	`+ }`
`26`	`31`	`}`
`27`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`import io.github.composegears.valkyrie.internal.composeCompiler`
`3`	`2`	`import io.github.composegears.valkyrie.internal.jetbrainsComposePluginId`
`4`	`3`	`import io.github.composegears.valkyrie.internal.kotlinComposePluginId`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`alias(libs.plugins.valkyrie.kmp)`
`3`		`- alias(libs.plugins.kover)`
	`3`	`+ alias(libs.plugins.valkyrie.kover)`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`alias(libs.plugins.valkyrie.kmp)`
`3`	`3`	`alias(libs.plugins.valkyrie.wasm.resources)`
`4`		`- alias(libs.plugins.kover)`
	`4`	`+ alias(libs.plugins.valkyrie.kover)`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`alias(libs.plugins.kotlin.jvm)`
`3`		`- alias(libs.plugins.kover)`
	`3`	`+ alias(libs.plugins.valkyrie.kover)`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`sourceSets {`