Upgraded intellij-coverage version to 1.0.724

Refactoring of Android SDK specification checks has also been performed.

Author: shanshin

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 
-intellij-coverage = "1.0.721"
+intellij-coverage = "1.0.724"
 junit = "5.9.0"
 kotlinx-bcv = "0.13.0"
 kotlinx-dokka = "1.8.10"

kover-gradle-plugin/build.gradle.kts

@@ -84,6 +84,7 @@ val functionalTest by tasks.registering(Test::class) {
 
 
         // customizing functional tests
+        setAndroidSdkDir()
         setSystemPropertyFromProject("kover.release.version")
         setSystemPropertyFromProject("kover.test.gradle.version")
         setSystemPropertyFromProject("kover.test.android.sdk")
@@ -93,6 +94,24 @@ val functionalTest by tasks.registering(Test::class) {
     }
 }
 
+fun Test.setAndroidSdkDir() {
+    if (project.hasProperty("kover.test.android.disable")) {
+        // do nothing if android tests are skipped
+        return
+    }
+    val sdkDir = if (project.hasProperty("kover.test.android.sdk")) {
+        project.property("kover.test.android.sdk")
+    } else {
+        environment["ANDROID_HOME"]
+    }
+
+    if (sdkDir == null) {
+        throw GradleException("Android SDK directory not specified, specify environment variable ANDROID_HOME or parameter -Pkover.test.android.sdk. To skip Android tests pass parameter -Pkover.test.android.disable")
+    }
+
+    systemProperties[name] = sdkDir
+}
+
 fun Test.setSystemPropertyFromProject(name: String) {
     if (project.hasProperty(name)) systemProperties[name] = project.property(name)
 }
@@ -106,7 +125,6 @@ fun Test.setBooleanSystemPropertyFromProject(
 
 tasks.check { dependsOn(functionalTest) }
 
-
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
         allWarningsAsErrors = true

kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/checker/Checker.kt

@@ -46,8 +46,6 @@ internal fun BuildResult.checkNoAndroidSdk() {
         ) {
             if (isAndroidTestDisabled) {
                 throw TestAbortedException("Android tests are disabled")
-            } else {
-                throw Exception("Android SDK directory not specified, specify environment variable $ANDROID_HOME_ENV or parameter -Pkover.test.android.sdk. To ignore Android tests pass parameter -Pkover.test.android.disable")
             }
         }
     }

kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/common/Environment.kt

@@ -6,11 +6,6 @@ package kotlinx.kover.gradle.plugin.test.functional.framework.common
 
 import java.io.File
 
-/**
- * Name of environment variable with Android SDK path.
- */
-internal const val ANDROID_HOME_ENV = "ANDROID_HOME"
-
 /**
  * Version of current Kover build.
  */
@@ -42,7 +37,7 @@ internal val overriddenGradleWrapperVersion: String? = System.getProperty("kover
 /**
  * Result path to the Android SDK. `null` if not defined.
  */
-internal val androidSdkDir: String? = System.getProperty("kover.test.android.sdk")?: System.getenv(ANDROID_HOME_ENV)
+internal val androidSdkDir: String? = System.getProperty("kover.test.android.sdk")
 
 
 

kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/runner/BuildsRunner.kt

@@ -4,7 +4,6 @@
 
 package kotlinx.kover.gradle.plugin.test.functional.framework.runner
 
-import kotlinx.kover.gradle.plugin.test.functional.framework.common.ANDROID_HOME_ENV
 import kotlinx.kover.gradle.plugin.test.functional.framework.common.isDebugEnabled
 import kotlinx.kover.gradle.plugin.test.functional.framework.common.logInfo
 import kotlinx.kover.gradle.plugin.test.functional.framework.common.uri
@@ -104,7 +103,7 @@ private class GradleBuildImpl(
         logInfo("Run Gradle commands $gradleArgs for project '${targetDir.canonicalPath}' with wrapper '${env.wrapperDir.canonicalPath}'")
 
         val envVars: MutableMap<String, String> = mutableMapOf()
-        env.androidSdkDir?.also { dir -> envVars[ANDROID_HOME_ENV] = dir }
+        env.androidSdkDir?.also { dir -> envVars["ANDROID_HOME"] = dir }
 
         val result = targetDir.buildGradleByShell(runCount++, env.wrapperDir, gradleArgs, envVars)
         logInfo("Success build $buildType '$buildName'")

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverVersions.kt

@@ -15,7 +15,7 @@ public object KoverVersions {
     /**
      * Kover coverage tool version.
      */
-    public const val KOVER_TOOL_VERSION = "1.0.721"
+    public const val KOVER_TOOL_VERSION = "1.0.724"
 
     /**
      * JaCoCo coverage tool version used by default.