[#170] Kover 0.7.0

Electric-Coin-Company · May 19, 2023 · 21bbbac · 21bbbac
1 parent c4c5302
commit 21bbbac
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 35 deletions.
diff --git a/bip39-lib/build.gradle.kts b/bip39-lib/build.gradle.kts
@@ -1,11 +1,17 @@
 import java.util.Base64
 
 plugins {
-    id("org.jetbrains.kotlin.multiplatform")
+    // https://github.com/gradle/gradle/issues/20084#issuecomment-1060822638
+    id(libs.plugins.kotlin.multiplatform.get().pluginId)
     alias(libs.plugins.dokka)
     alias(libs.plugins.kotest)
     id("bip39.kotlin-multiplatform-conventions")
     id("bip39.dependency-conventions")
+
+    // https://github.com/gradle/gradle/issues/20084#issuecomment-1060822638
+    id(libs.plugins.kotlinx.kover.get().pluginId)
+    id("bip39.coverage-conventions")
+
     id("maven-publish")
     id("signing")
 }

diff --git a/bip39-lib/gradle.lockfile b/bip39-lib/gradle.lockfile
diff --git a/build-conventions-bip39/build.gradle.kts b/build-conventions-bip39/build.gradle.kts
@@ -13,11 +13,7 @@ dependencyLocking {
 }
 
 dependencies {
-    val rootProperties = getRootProperties()
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProperties.getProperty("KOTLIN_VERSION")}")
-    implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${rootProperties.getProperty("DETEKT_VERSION")}")
+    implementation(libs.kotlin.gradle)
+    implementation(libs.kotlinx.kover.gradle)
+    implementation(libs.detekt.gradle)
 }
-
-// A slightly gross way to use the root gradle.properties as the single source of truth for version numbers
-fun getRootProperties() =
-    org.jetbrains.kotlin.konan.properties.loadProperties(File(project.projectDir.parentFile, "gradle.properties").path)
diff --git a/build-conventions-bip39/gradle.lockfile b/build-conventions-bip39/gradle.lockfile
@@ -49,10 +49,12 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.21=compileClasspath,runtimeClasspat
 org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-util-io:1.8.21=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-util-klib:1.8.21=runtimeClasspath
+org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin:0.7.0=compileClasspath,runtimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=runtimeClasspath
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.1.0=runtimeClasspath
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0=runtimeClasspath
 org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0=runtimeClasspath
 org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0=runtimeClasspath
+org.jetbrains.kotlinx:kover-gradle-plugin:0.7.0=compileClasspath,runtimeClasspath
 org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath
 empty=annotationProcessor,kotlinScriptDefExtensions
diff --git a/build-conventions-bip39/src/main/kotlin/bip39.coverage-conventions.gradle.kts b/build-conventions-bip39/src/main/kotlin/bip39.coverage-conventions.gradle.kts
@@ -0,0 +1,19 @@
+pluginManager.withPlugin("org.jetbrains.kotlinx.kover") {
+    extensions.findByType<kotlinx.kover.gradle.plugin.dsl.KoverProjectExtension>()?.apply {
+        if (!project.property("BIP39_IS_COVERAGE_ENABLED").toString().toBoolean()) {
+            disable()
+        }
+    }
+    extensions.findByType<kotlinx.kover.gradle.plugin.dsl.KoverReportExtension>()?.apply {
+        defaults {
+            html {
+                onCheck = true
+                setReportDir(layout.buildDirectory.dir("reports/kover/html"))
+            }
+            xml {
+                onCheck = true
+                setReportFile(layout.buildDirectory.file("reports/kover/xml/report.xml"))
+            }
+        }
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,6 @@ dependencyLocking {
 plugins {
     id("bip39.detekt-conventions")
     id("bip39.ktlint-conventions")
-    alias(libs.plugins.kover)
     alias(libs.plugins.versions)
 }
 
@@ -32,11 +31,6 @@ tasks {
     }
 }
 
-kover {
-    isDisabled.set(!project.property("BIP39_IS_COVERAGE_ENABLED").toString().toBoolean())
-    engine.set(kotlinx.kover.api.JacocoEngine(libs.versions.jacoco.get()))
-}
-
 val unstableKeywords = listOf("alpha", "beta", "rc", "m", "ea", "build")
 fun isNonStable(version: String): Boolean {
     val versionLowerCase = version.toLowerCase()

diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
@@ -41,13 +41,13 @@ org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath
 org.jetbrains.kotlin:kotlin-tooling-core:1.8.21=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.8.21=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.8.21=classpath
-org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin:0.6.1=classpath
+org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin:0.7.0=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.1.0=classpath
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0=classpath
 org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0=classpath
 org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0=classpath
-org.jetbrains.kotlinx:kover:0.6.1=classpath
+org.jetbrains.kotlinx:kover-gradle-plugin:0.7.0=classpath
 org.jetbrains:annotations:13.0=classpath
 xmlpull:xmlpull:1.1.3.1=classpath
 empty=
diff --git a/gradle.properties b/gradle.properties
@@ -13,8 +13,6 @@ BIP39_IS_COVERAGE_ENABLED=true
 
 JVM_TOOLCHAIN=17
 JVM_TARGET=8
-KOTLIN_VERSION=1.8.21
-DETEKT_VERSION=1.22.0
 
 # Publishing
 ZCASH_MAVEN_PUBLISH_SNAPSHOT_URL=https://oss.sonatype.org/content/repositories/snapshots/

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,23 @@
 [versions]
-# Kotlin version is defined in gradle.properties
-jacoco = "0.8.10"
 kotest = "5.6.2"
+kotlin = "1.8.21"
+kotlinx-kover = "0.7.0"
 ktlint = "0.49.0"
 okio = "3.3.0"
 
 [libraries]
 com-squareup-okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
+detekt-gradle = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0"
 kotest-framework-engine = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
 kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest" }
 kotest-assertion = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
 kotest-property = { module = "io.kotest:kotest-property", version.ref = "kotest" }
+kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlinx-kover-gradle = { module = "org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin", version.ref = "kotlinx-kover" }
 
 [plugins]
 dokka = "org.jetbrains.dokka:1.8.10"
-kover = "org.jetbrains.kotlinx.kover:0.6.1"
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 versions = "com.github.ben-manes.versions:0.46.0"
 kotest = { id = "io.kotest.multiplatform", version.ref = "kotest" }
+kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kotlinx-kover" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,12 +1,5 @@
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-pluginManagement {
-    plugins {
-        val kotlinVersion = extra["KOTLIN_VERSION"].toString()
-        id("org.jetbrains.kotlin.multiplatform") version(kotlinVersion) apply(false)
-    }
-}
-
 dependencyResolutionManagement {
     @Suppress("UnstableApiUsage")
     repositories {