diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 08b8b6e1..76e4427f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -21,4 +21,4 @@ jobs: uses: gradle/gradle-build-action@v2 - name: Verify - run: ./gradlew --no-daemon koverMergedVerify + run: ./gradlew --no-daemon koverVerify diff --git a/build.gradle.kts b/build.gradle.kts index d59bed68..205f0313 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,15 +6,22 @@ repositories { mavenCentral() } -koverMerged { - enable() - htmlReport {} - xmlReport {} - verify { - rule { - name = "Minimal line coverage rate in percent" - bound { - minValue = 80 +dependencies { + kover(project(":common")) + kover(project(":lexer")) + kover(project(":parser")) + kover(project(":semantic")) + kover(project(":cli")) + kover(project(":language-server")) +} + +koverReport { + defaults { + verify { + rule { + bound { + minValue = 80 + } } } } diff --git a/buildSrc/src/main/kotlin/samt-core.kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/samt-core.kotlin-conventions.gradle.kts index 7bb7f2ae..bd9e46be 100644 --- a/buildSrc/src/main/kotlin/samt-core.kotlin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/samt-core.kotlin-conventions.gradle.kts @@ -3,7 +3,8 @@ plugins { kotlin("plugin.serialization") apply false } -apply(plugin = "kover") +// does not work with Kover 0.7.0-Beta for some reason +//apply(plugin = "kover") kotlin { jvmToolchain(17) diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts index 7253ab76..a2cab7e4 100644 --- a/cli/build.gradle.kts +++ b/cli/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("samt-core.kotlin-conventions") alias(libs.plugins.shadow) kotlin("plugin.serialization") + alias(libs.plugins.kover) } dependencies { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index d194b3df..65973888 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,3 +1,4 @@ plugins { id("samt-core.kotlin-conventions") + alias(libs.plugins.kover) } diff --git a/language-server/build.gradle.kts b/language-server/build.gradle.kts index c2ec680f..7f7d8100 100644 --- a/language-server/build.gradle.kts +++ b/language-server/build.gradle.kts @@ -2,6 +2,7 @@ plugins { application id("samt-core.kotlin-conventions") alias(libs.plugins.shadow) + alias(libs.plugins.kover) } dependencies { diff --git a/lexer/build.gradle.kts b/lexer/build.gradle.kts index 69d8cbe6..f2b02990 100644 --- a/lexer/build.gradle.kts +++ b/lexer/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("samt-core.kotlin-conventions") + alias(libs.plugins.kover) } dependencies { diff --git a/parser/build.gradle.kts b/parser/build.gradle.kts index 3bbac1f1..51a6ee58 100644 --- a/parser/build.gradle.kts +++ b/parser/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("samt-core.kotlin-conventions") + alias(libs.plugins.kover) } dependencies { diff --git a/semantic/build.gradle.kts b/semantic/build.gradle.kts index c797ee3d..8c543873 100644 --- a/semantic/build.gradle.kts +++ b/semantic/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("samt-core.kotlin-conventions") + alias(libs.plugins.kover) } dependencies { diff --git a/settings.gradle.kts b/settings.gradle.kts index e20de388..31cb794b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,7 @@ dependencyResolutionManagement { val jCommander = "1.82" val mordant = "2.0.0-beta13" val kotlinxSerialization = "1.5.0" - val kover = "0.6.1" + val kover = "0.7.0-Beta" val lsp4j = "0.20.1" create("libs") {