chore: カバレッジの計測方法を命令網羅に変更

.github/workflows/pull-request-merge-check.yml

@@ -85,15 +85,17 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           title: Code Coverage
           update-comment: true
-          min-coverage-overall: 80
+          min-coverage-overall: 50
           min-coverage-changed-files: 80
-          coverage-counter-type: LINE
 
       - name: JUnit Test Report
         uses: mikepenz/action-junit-report@v4
         with:
           report_paths: '**/TEST-*.xml'
 
+      - name: Verify Coverage
+        run: ./hideout-core/gradlew :hideout-core:koverVerify
+
   lint:
     name: Lint
     needs: [ setup ]

hideout-core/build.gradle.kts

@@ -19,6 +19,7 @@ import com.github.jk1.license.filter.LicenseBundleNormalizer
 import com.github.jk1.license.importer.DependencyDataImporter
 import com.github.jk1.license.importer.XmlReportImporter
 import com.github.jk1.license.render.*
+import kotlinx.kover.gradle.plugin.dsl.CoverageUnit
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -37,19 +38,6 @@ apply {
 group = "dev.usbharu"
 version = "0.0.1"
 
-
-tasks.withType<Test> {
-    useJUnitPlatform()
-    doFirst {
-        jvmArgs = arrayOf(
-            "--add-opens", "java.base/java.lang=ALL-UNNAMED",
-            "--add-opens", "java.base/java.util=ALL-UNNAMED",
-            "--add-opens", "java.naming/javax.naming=ALL-UNNAMED",
-            "--add-opens", "java.base/java.util.concurrent.locks=ALL-UNNAMED"
-        ).toMutableList()
-    }
-}
-
 kotlin {
     jvmToolchain(21)
     compilerOptions {
@@ -85,8 +73,7 @@ repositories {
 }
 
 
-val os = org.gradle.nativeplatform.platform.internal
+val os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentOperatingSystem()
-    .DefaultNativePlatform.getCurrentOperatingSystem()
 
 dependencies {
     developmentOnly(libs.h2db)
@@ -173,35 +160,40 @@ configurations {
     }
 }
 
-
+tasks {
-//tasks{
+    withType<io.gitlab.arturbosch.detekt.Detekt> {
-//    bootRun {
-//        sourceResources(sourceSets.main.get())
-//    }
-//}
-
-tasks.withType<io.gitlab.arturbosch.detekt.Detekt> {
         exclude("**/generated/**")
-    doFirst {
-
-    }
         setSource("src/main/kotlin")
         exclude("build/")
+        configureEach {
+            exclude("**/org/koin/ksp/generated/**", "**/generated/**")
+        }
+    }
+    withType<io.gitlab.arturbosch.detekt.DetektCreateBaselineTask>() {
+        configureEach {
+            exclude("**/org/koin/ksp/generated/**", "**/generated/**")
+        }
+    }
+    withType<Test> {
+        useJUnitPlatform()
+        doFirst {
+            jvmArgs = arrayOf(
+                "--add-opens",
+                "java.base/java.lang=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.util=ALL-UNNAMED",
+                "--add-opens",
+                "java.naming/javax.naming=ALL-UNNAMED",
+                "--add-opens",
+                "java.base/java.util.concurrent.locks=ALL-UNNAMED"
+            ).toMutableList()
+        }
+    }
 }
 
-tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
-    exclude("**/org/koin/ksp/generated/**", "**/generated/**")
-}
-
-tasks.withType<io.gitlab.arturbosch.detekt.DetektCreateBaselineTask>().configureEach {
-    exclude("**/org/koin/ksp/generated/**", "**/generated/**")
-}
 
 project.gradle.taskGraph.whenReady {
-    println(this.allTasks)
-    this.allTasks.map { println(it.name) }
     if (this.hasTask(":koverGenerateArtifact")) {
-        println("has task")
         val task = this.allTasks.find { it.name == "test" }
         val verificationTask = task as VerificationTask
         verificationTask.ignoreFailures = true
@@ -211,23 +203,22 @@ project.gradle.taskGraph.whenReady {
 kover {
     currentProject {
         sources {
-            excludedSourceSets.addAll(
+
-                "aot", "e2eTest", "intTest"
-            )
 
         }
     }
 
     reports {
+        verify {
+            rule {
+                bound{
+                    minValue = 50
+                    coverageUnits = CoverageUnit.INSTRUCTION
+                }
+            }
+        }
         filters {
             excludes {
-                packages(
-                    "dev.usbharu.hideout.activitypub.domain.exception",
-                    "dev.usbharu.hideout.core.domain.exception",
-                    "dev.usbharu.hideout.core.domain.exception.media",
-                    "dev.usbharu.hideout.core.domain.exception.resource",
-                    "dev.usbharu.hideout.core.domain.exception.resource.local"
-                )
                 annotatedBy("org.springframework.context.annotation.Configuration")
                 annotatedBy("org.springframework.boot.context.properties.ConfigurationProperties")
                 packages(
@@ -252,10 +243,7 @@ licenseReport {
 
     importers = arrayOf<DependencyDataImporter>(XmlReportImporter("hideout", File("$projectDir/license-list.xml")))
     renderers = arrayOf<ReportRenderer>(
-        InventoryHtmlReportRenderer(),
+        InventoryHtmlReportRenderer(), CsvReportRenderer(), JsonReportRenderer(), XmlReportRenderer()
-        CsvReportRenderer(),
-        JsonReportRenderer(),
-        XmlReportRenderer()
     )
     filters = arrayOf<DependencyFilter>(LicenseBundleNormalizer("$projectDir/license-normalizer-bundle.json", true))
     allowedLicensesFile = File("$projectDir/allowed-licenses.json")