From da678fb360effdf7aa800ed5bcaff56b0d16bbca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?=
 <ivan.canet@gmail.com>
Date: Sat, 24 Sep 2022 16:40:40 +0200
Subject: [PATCH] upgrade: Kover 0.6.0

The migration from 0.5.* to 0.6.* is necessary because of https://github.com/Kotlin/kotlinx-kover/issues/210 (triggered by the Spine project).
---
 .gitlab-ci.yml            |  4 ++--
 backbone/build.gradle.kts | 16 +++++++++-------
 build.gradle.kts          |  3 +++
 logger/build.gradle.kts   | 16 +++++++++-------
 spine/build.gradle.kts    | 16 +++++++++-------
 versions.properties       |  2 +-
 6 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bdd883..dd2666a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,8 +41,8 @@ backbone:publish:
   after_script:
     - mkdir -p test-report-$module
     - mv $module/build/reports/tests/jvmTest test-report-$module/test
-    - mv $module/build/reports/kover/project-html test-report-$module/coverage
-    - mv $module/build/reports/kover/project-xml/report.xml test-report-$module/coverage.xml
+    - mv $module/build/reports/kover/html test-report-$module/coverage
+    - mv $module/build/reports/kover/xml/report.xml test-report-$module/coverage.xml
     - values=$(cat test-report-$module/coverage.xml | tail -7 | head -5 | grep 'INSTRUCTION' | cut -d ' ' -f 3,4 | sed 's/missed="//;s/" covered="/ /;s/"\/>//')
     - missed=$(<<<$values cut -d ' ' -f 1)
     - covered=$(<<<$values cut -d ' ' -f 2)
diff --git a/backbone/build.gradle.kts b/backbone/build.gradle.kts
index 156b73f..4adcf1c 100644
--- a/backbone/build.gradle.kts
+++ b/backbone/build.gradle.kts
@@ -56,11 +56,13 @@ publishing {
 	}
 }
 
-tasks.koverVerify {
-	rule {
-        name = "Minimal code coverage"
-        bound {
-            minValue = 80
-        }
-    }
+kover {
+	verify {
+		rule {
+			name = "Minimal code coverage"
+			bound {
+				minValue = 80
+			}
+		}
+	}
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index 5889fdd..048262d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,8 +19,11 @@ allprojects {
     }
 
     plugins.apply("org.jetbrains.dokka")
+    plugins.apply("org.jetbrains.kotlinx.kover")
 }
 
+koverMerged.enable()
+
 fun calculateVersion(): String {
     val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
     val details = versionDetails()
diff --git a/logger/build.gradle.kts b/logger/build.gradle.kts
index 4d7ff32..9700fc3 100644
--- a/logger/build.gradle.kts
+++ b/logger/build.gradle.kts
@@ -51,11 +51,13 @@ publishing {
 	}
 }
 
-tasks.koverVerify {
-	rule {
-        name = "Minimal code coverage"
-        bound {
-            minValue = 90
-        }
-    }
+kover {
+	verify {
+		rule {
+			name = "Minimal code coverage"
+			bound {
+				minValue = 90
+			}
+		}
+	}
 }
diff --git a/spine/build.gradle.kts b/spine/build.gradle.kts
index e92590a..13ec7bd 100644
--- a/spine/build.gradle.kts
+++ b/spine/build.gradle.kts
@@ -58,11 +58,13 @@ publishing {
 	}
 }
 
-tasks.koverVerify {
-	rule {
-        name = "Minimal code coverage"
-        bound {
-            minValue = 80
-        }
-    }
+kover {
+	verify {
+		rule {
+			name = "Minimal code coverage"
+			bound {
+				minValue = 80
+			}
+		}
+	}
 }
diff --git a/versions.properties b/versions.properties
index 1033bc0..523ea18 100644
--- a/versions.properties
+++ b/versions.properties
@@ -11,7 +11,7 @@ plugin.com.palantir.git-version=0.15.0
 
 plugin.org.jetbrains.dokka=1.7.10
 
-plugin.org.jetbrains.kotlinx.kover=0.5.1
+plugin.org.jetbrains.kotlinx.kover=0.6.0
 
 version.com.auth0..java-jwt=3.19.2