Skip to content

Commit 710874d

Browse files
committed
build: simplify JaCoCo configuration
1 parent 8c87d79 commit 710874d

File tree

2 files changed

+26
-40
lines changed

2 files changed

+26
-40
lines changed

build.gradle.kts

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
kotlin("multiplatform")
88
alias(libs.plugins.detekt)
99
alias(libs.plugins.vanniktech)
10-
id("jacoco-convention")
10+
jacoco
1111
}
1212

1313
group = "io.github.petertrr"
@@ -167,6 +167,10 @@ mavenPublishing {
167167
}
168168
}
169169

170+
jacoco {
171+
toolVersion = "0.8.13"
172+
}
173+
170174
detekt {
171175
buildUponDefaultConfig = true
172176
config.setFrom(files("detekt.yml"))
@@ -177,4 +181,25 @@ tasks {
177181
check {
178182
dependsOn(detekt)
179183
}
184+
185+
val jvmTest = named<Test>("jvmTest")
186+
val jacocoReport = register<JacocoReport>("jacocoTestReport") {
187+
dependsOn(jvmTest)
188+
189+
val commonMainSources = kotlin.sourceSets["commonMain"].kotlin.sourceDirectories
190+
val jvmMainSources = kotlin.sourceSets["jvmMain"].kotlin.sourceDirectories
191+
192+
sourceDirectories.setFrom(files(commonMainSources, jvmMainSources))
193+
classDirectories.setFrom(layout.buildDirectory.file("classes/kotlin/jvm/main"))
194+
executionData.setFrom(layout.buildDirectory.files("jacoco/jvmTest.exec"))
195+
196+
reports {
197+
xml.required = true
198+
html.required = true
199+
}
200+
}
201+
202+
jvmTest.configure {
203+
finalizedBy(jacocoReport)
204+
}
180205
}

buildSrc/src/main/kotlin/io/github/petertrr/jacoco-convention.gradle.kts

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)