Revert "Update Kover to 0.6.0-Beta (#3386)"

This reverts commit 79e32f7.

Author: PavelPunegov

buildSrc/src/main/kotlin/kover-conventions.gradle.kts

@@ -4,6 +4,7 @@ import kotlinx.kover.tasks.*
 /*
  * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
+apply(plugin = "kover")
 
 val notCovered = sourceless + internal + unpublished
 
@@ -13,43 +14,41 @@ val expectedCoverage = mutableMapOf(
     "kotlinx-coroutines-javafx" to 39, // JavaFx is not tested on TC because its graphic subsystem cannot be initialized in headless mode
 
     // Reactor has lower coverage in general due to various fatal error handling features
-    "kotlinx-coroutines-reactor" to 75
-)
-
-
+    "kotlinx-coroutines-reactor" to 75)
+
+extensions.configure<KoverExtension> {
+    disabledProjects = notCovered
+    /*
+     * Is explicitly enabled on TC in a separate build step.
+     * Examples:
+     * ./gradlew :p:check -- doesn't verify coverage
+     * ./gradlew :p:check -Pkover.enabled=true -- verifies coverage
+     * ./gradlew :p:koverReport -Pkover.enabled=true -- generates report
+     */
+    isDisabled = !(properties["kover.enabled"]?.toString()?.toBoolean() ?: false)
+    // TODO remove when updating Kover to version 0.5.x
+    intellijEngineVersion.set("1.0.657")
+}
 
 subprojects {
     val projectName = name
     if (projectName in notCovered) return@subprojects
-    apply(plugin = "kover")
-
-    extensions.configure<KoverProjectConfig> {
-        /*
-         * Is explicitly enabled on TC in a separate build step.
-         * Examples:
-         * ./gradlew :p:check -- doesn't verify coverage
-         * ./gradlew :p:check -Pkover.enabled=true -- verifies coverage
-         * ./gradlew :p:koverReport -Pkover.enabled=true -- generates report
-         */
-        isDisabled.set(!(properties["kover.enabled"]?.toString()?.toBoolean() ?: false))
-
-        verify {
-            rule {
-                bound {
-                    /*
-                     * 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.
-                     */
-                    minValue = expectedCoverage[projectName] ?: 85 // COVERED_LINES_PERCENTAGE
-                }
+    tasks.withType<KoverVerificationTask> {
+        rule {
+            bound {
+                /*
+                 * 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.
+                 */
+                minValue = expectedCoverage[projectName] ?: 85 // COVERED_LINES_PERCENTAGE
             }
         }
+    }
 
-        htmlReport {
-            reportDir.set(file(rootProject.buildDir.toString() + "/kover/" + project.name + "/html"))
-        }
+    tasks.withType<KoverHtmlReportTask> {
+        htmlReportDir.set(file(rootProject.buildDir.toString() + "/kover/" + project.name + "/html"))
     }
 }

reactive/kotlinx-coroutines-reactive/build.gradle.kts

@@ -41,10 +41,10 @@ val commonKoverExcludes = listOf(
     "kotlinx.coroutines.reactive.ConvertKt" // Deprecated
 )
 
-kover {
-    filters {
-        classes {
-            excludes += commonKoverExcludes
-        }
-    }
+tasks.koverHtmlReport {
+    excludes = commonKoverExcludes
+}
+
+tasks.koverVerify {
+    excludes = commonKoverExcludes
 }

reactive/kotlinx-coroutines-reactor/build.gradle.kts

@@ -33,10 +33,10 @@ val commonKoverExcludes = listOf(
     "kotlinx.coroutines.reactor.ConvertKt\$asFlux$1" // Deprecated
 )
 
-kover {
-    filters {
-        classes {
-            excludes += commonKoverExcludes
-        }
-    }
+tasks.koverHtmlReport {
+    excludes = commonKoverExcludes
+}
+
+tasks.koverVerify {
+    excludes = commonKoverExcludes
 }

ui/kotlinx-coroutines-android/build.gradle.kts

@@ -115,6 +115,6 @@ open class RunR8 : JavaExec() {
 
 tasks.withType<Test> {
     extensions.configure<KoverTaskExtension> {
-        excludes.addAll(listOf("com.android.*", "android.*")) // Exclude robolectric-generated classes
+        excludes = excludes + listOf("com.android.*", "android.*") // Exclude robolectric-generated classes
     }
 }