Bump Kover version to 0.8.0-Beta (#4055)

shanshin · web-flow · commit 48178b37433c · 2024-03-01T11:37:15.000+01:00
diff --git a/buildSrc/src/main/kotlin/kover-conventions.gradle.kts b/buildSrc/src/main/kotlin/kover-conventions.gradle.kts
@@ -37,33 +37,37 @@ subprojects {
         }
     }
 
-    extensions.configure<KoverReportExtension>("koverReport") {
-        defaults {
-            html {
-                setReportDir(conventionProject.layout.buildDirectory.dir("kover/${project.name}/html"))
-            }
+    extensions.configure<KoverProjectExtension>("kover") {
+        reports {
+            total {
+                html {
+                    htmlDir = conventionProject.layout.buildDirectory.dir("kover/${project.name}/html")
+                }
 
-            verify {
-                rule {
-                    /*
-                    * 85 is our baseline that we aim to raise to 90+.
-                    * Missing coverage is typically due to bugs in the agent
-                    * (e.g. signatures deprecated with an error are counted),
-                    * sometimes it's various diagnostic `toString` or `catch` for OOMs/VerificationErrors,
-                    * but some places are definitely worth visiting.
-                    */
-                    minBound(expectedCoverage[projectName] ?: 85) // COVERED_LINES_PERCENTAGE
+                verify {
+                    rule {
+                        /*
+                        * 85 is our baseline that we aim to raise to 90+.
+                        * Missing coverage is typically due to bugs in the agent
+                        * (e.g. signatures deprecated with an error are counted),
+                        * sometimes it's various diagnostic `toString` or `catch` for OOMs/VerificationErrors,
+                        * but some places are definitely worth visiting.
+                        */
+                        minBound(expectedCoverage[projectName] ?: 85) // COVERED_LINES_PERCENTAGE
+                    }
                 }
             }
         }
     }
 }
 
-koverReport {
-    defaults {
-        verify {
-            rule {
-                minBound(85) // COVERED_LINES_PERCENTAGE
+kover {
+    reports {
+        total {
+            verify {
+                rule {
+                    minBound(85) // COVERED_LINES_PERCENTAGE
+                }
             }
         }
     }
diff --git a/gradle.properties b/gradle.properties
@@ -20,7 +20,7 @@ rxjava3_version=3.0.2
 javafx_version=17.0.2
 javafx_plugin_version=0.0.8
 binary_compatibility_validator_version=0.13.2
-kover_version=0.7.4
+kover_version=0.8.0-Beta
 blockhound_version=1.0.8.RELEASE
 jna_version=5.9.0
 
diff --git a/kotlinx-coroutines-core/build.gradle.kts b/kotlinx-coroutines-core/build.gradle.kts
@@ -272,31 +272,31 @@ val check by tasks.getting {
 }
 
 kover {
-    excludeTests {
-        // Always disabled, lincheck doesn't really support coverage
-        tasks("jvmLincheckTest")
-    }
+    currentProject {
+        instrumentation {
+            // Always disabled, lincheck doesn't really support coverage
+            disabledForTestTasks.addAll("jvmLincheckTest")
 
-    excludeInstrumentation {
-        // lincheck has NPE error on `ManagedStrategyStateHolder` class
-        classes("org.jetbrains.kotlinx.lincheck.*")
+            // lincheck has NPE error on `ManagedStrategyStateHolder` class
+            excludedClasses.addAll("org.jetbrains.kotlinx.lincheck.*")
+        }
     }
-}
 
-koverReport {
-    filters {
-        excludes {
-            classes(
-                "kotlinx.coroutines.debug.*", // Tested by debug module
-                "kotlinx.coroutines.channels.ChannelsKt__DeprecatedKt*", // Deprecated
-                "kotlinx.coroutines.scheduling.LimitingDispatcher", // Deprecated
-                "kotlinx.coroutines.scheduling.ExperimentalCoroutineDispatcher", // Deprecated
-                "kotlinx.coroutines.flow.FlowKt__MigrationKt*", // Migrations
-                "kotlinx.coroutines.flow.LintKt*", // Migrations
-                "kotlinx.coroutines.internal.WeakMapCtorCache", // Fallback implementation that we never test
-                "_COROUTINE._CREATION", // For IDE navigation
-                "_COROUTINE._BOUNDARY", // For IDE navigation
-            )
+    reports {
+        filters {
+            excludes {
+                classes(
+                    "kotlinx.coroutines.debug.*", // Tested by debug module
+                    "kotlinx.coroutines.channels.ChannelsKt__DeprecatedKt*", // Deprecated
+                    "kotlinx.coroutines.scheduling.LimitingDispatcher", // Deprecated
+                    "kotlinx.coroutines.scheduling.ExperimentalCoroutineDispatcher", // Deprecated
+                    "kotlinx.coroutines.flow.FlowKt__MigrationKt*", // Migrations
+                    "kotlinx.coroutines.flow.LintKt*", // Migrations
+                    "kotlinx.coroutines.internal.WeakMapCtorCache", // Fallback implementation that we never test
+                    "_COROUTINE._CREATION", // For IDE navigation
+                    "_COROUTINE._BOUNDARY", // For IDE navigation
+                )
+            }
         }
     }
 }
diff --git a/kotlinx-coroutines-debug/build.gradle.kts b/kotlinx-coroutines-debug/build.gradle.kts
@@ -99,11 +99,13 @@ configurations {
     }
 }
 
-koverReport {
-    filters {
-        excludes {
-            // Never used, safety mechanism
-            classes("kotlinx.coroutines.debug.internal.NoOpProbesKt")
+kover {
+    reports {
+        filters {
+            excludes {
+                // Never used, safety mechanism
+                classes("kotlinx.coroutines.debug.internal.NoOpProbesKt")
+            }
         }
     }
 }
diff --git a/reactive/kotlinx-coroutines-reactive/build.gradle.kts b/reactive/kotlinx-coroutines-reactive/build.gradle.kts
@@ -36,14 +36,16 @@ externalDocumentationLink(
     url = "https://www.reactive-streams.org/reactive-streams-$reactiveStreamsVersion-javadoc/"
 )
 
-koverReport {
-    filters {
-        excludes {
-            classes(
-                "kotlinx.coroutines.reactive.FlowKt", // Deprecated
-                "kotlinx.coroutines.reactive.FlowKt__MigrationKt", // Deprecated
-                "kotlinx.coroutines.reactive.ConvertKt" // Deprecated
-            )
+kover {
+    reports {
+        filters {
+            excludes {
+                classes(
+                    "kotlinx.coroutines.reactive.FlowKt", // Deprecated
+                    "kotlinx.coroutines.reactive.FlowKt__MigrationKt", // Deprecated
+                    "kotlinx.coroutines.reactive.ConvertKt" // Deprecated
+                )
+            }
         }
     }
 }
diff --git a/reactive/kotlinx-coroutines-reactor/build.gradle.kts b/reactive/kotlinx-coroutines-reactor/build.gradle.kts
@@ -32,13 +32,15 @@ externalDocumentationLink(
 )
 
 
-koverReport {
-    filters {
-        excludes {
-            classes(
-                "kotlinx.coroutines.reactor.FlowKt", // Deprecated
-                "kotlinx.coroutines.reactor.ConvertKt\$asFlux$1" // Deprecated
-            )
+kover {
+    reports {
+        filters {
+            excludes {
+                classes(
+                    "kotlinx.coroutines.reactor.FlowKt", // Deprecated
+                    "kotlinx.coroutines.reactor.ConvertKt\$asFlux$1" // Deprecated
+                )
+            }
         }
     }
 }
diff --git a/ui/kotlinx-coroutines-android/build.gradle.kts b/ui/kotlinx-coroutines-android/build.gradle.kts
@@ -1,5 +1,3 @@
-import kotlinx.kover.api.*
-
 configurations {
     create("r8")
 }

Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,13 @@ configurations {`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`-koverReport {`
`103`		`- filters {`
`104`		`- excludes {`
`105`		`- // Never used, safety mechanism`
`106`		`- classes("kotlinx.coroutines.debug.internal.NoOpProbesKt")`
	`102`	`+kover {`
	`103`	`+ reports {`
	`104`	`+ filters {`
	`105`	`+ excludes {`
	`106`	`+ // Never used, safety mechanism`
	`107`	`+ classes("kotlinx.coroutines.debug.internal.NoOpProbesKt")`
	`108`	`+ }`
`107`	`109`	`}`
`108`	`110`	`}`
`109`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,16 @@ externalDocumentationLink(`
`36`	`36`	`url = "https://www.reactive-streams.org/reactive-streams-$reactiveStreamsVersion-javadoc/"`
`37`	`37`	`)`
`38`	`38`
`39`		`-koverReport {`
`40`		`- filters {`
`41`		`- excludes {`
`42`		`- classes(`
`43`		`- "kotlinx.coroutines.reactive.FlowKt", // Deprecated`
`44`		`- "kotlinx.coroutines.reactive.FlowKt__MigrationKt", // Deprecated`
`45`		`- "kotlinx.coroutines.reactive.ConvertKt" // Deprecated`
`46`		`- )`
	`39`	`+kover {`
	`40`	`+ reports {`
	`41`	`+ filters {`
	`42`	`+ excludes {`
	`43`	`+ classes(`
	`44`	`+ "kotlinx.coroutines.reactive.FlowKt", // Deprecated`
	`45`	`+ "kotlinx.coroutines.reactive.FlowKt__MigrationKt", // Deprecated`
	`46`	`+ "kotlinx.coroutines.reactive.ConvertKt" // Deprecated`
	`47`	`+ )`
	`48`	`+ }`
`47`	`49`	`}`
`48`	`50`	`}`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,15 @@ externalDocumentationLink(`
`32`	`32`	`)`
`33`	`33`
`34`	`34`
`35`		`-koverReport {`
`36`		`- filters {`
`37`		`- excludes {`
`38`		`- classes(`
`39`		`- "kotlinx.coroutines.reactor.FlowKt", // Deprecated`
`40`		`- "kotlinx.coroutines.reactor.ConvertKt\$asFlux$1" // Deprecated`
`41`		`- )`
	`35`	`+kover {`
	`36`	`+ reports {`
	`37`	`+ filters {`
	`38`	`+ excludes {`
	`39`	`+ classes(`
	`40`	`+ "kotlinx.coroutines.reactor.FlowKt", // Deprecated`
	`41`	`+ "kotlinx.coroutines.reactor.ConvertKt\$asFlux$1" // Deprecated`
	`42`	`+ )`
	`43`	`+ }`
`42`	`44`	`}`
`43`	`45`	`}`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import kotlinx.kover.api.*`
`2`		`-`
`3`	`1`	`configurations {`
`4`	`2`	`create("r8")`
`5`	`3`	`}`