Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 0 additions & 13 deletions codecov.yml

This file was deleted.

2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down Expand Up @@ -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 = [
Expand Down
11 changes: 1 addition & 10 deletions manami-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -128,15 +128,6 @@ tasks.withType<Test> {
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>("test") })
}

fun parameter(name: String, default: String = ""): String {
val env = System.getenv(name) ?: ""
if (env.isNotBlank()) {
Expand Down