diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index be2cab778..39842462c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -47,9 +47,10 @@ jobs: /github/workspace/**/build/test-results/**/*.xml - name: Generate coverage if: ${{ matrix.java == 21 }} - run: ./gradlew jacocoTestReport + run: ./gradlew koverXmlReportJvm - name: Upload coverage uses: codecov/codecov-action@v4.5.0 if: ${{ matrix.java == 21 }} with: token: ${{ secrets.CODECOV_TOKEN }} + file: manami-app/build/reports/kover/reportJvm.xml diff --git a/codecov.yml b/codecov.yml deleted file mode 100644 index cd5b4da01..000000000 --- a/codecov.yml +++ /dev/null @@ -1,13 +0,0 @@ -coverage: - status: - project: - default: - informational: true - -comment: - layout: "diff, flags, files" - behavior: default - require_changes: false - require_base: false - require_head: true - hide_project_coverage: false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8f7d7ae40..a8b0a4f66 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,6 +18,7 @@ logback-classic = "1.5.6" tornadofx = "1.7.20" tornadofx-controlsfx = "0.1.1" javafx = "23-ea+22" +kover = "0.8.2" [libraries] kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } @@ -48,6 +49,7 @@ javafx-web = { module = "org.openjfx:javafx-web", version.ref = "javafx" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } javafxplugin = { id = "org.openjfx.javafxplugin", version = "0.1.0" } shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } +kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } [bundles] kotlin = [ diff --git a/manami-app/build.gradle.kts b/manami-app/build.gradle.kts index fa7f5ad49..0f9a37082 100644 --- a/manami-app/build.gradle.kts +++ b/manami-app/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.kover) `java-library` - jacoco } val githubUsername = "manami-project" @@ -128,15 +128,6 @@ tasks.withType { maxParallelForks = Runtime.getRuntime().availableProcessors() } -tasks.jacocoTestReport { - reports { - html.required.set(false) - xml.required.set(true) - xml.outputLocation.set(file("${layout.buildDirectory.asFile.get().absolutePath}/reports/jacoco/test/jacocoFullReport.xml")) - } - dependsOn(allprojects.map { it.tasks.named("test") }) -} - fun parameter(name: String, default: String = ""): String { val env = System.getenv(name) ?: "" if (env.isNotBlank()) {