Merge branch 'main' into twyatt/ci

.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# https://help.github.com/articles/about-codeowners/
+
+* @JuulLabs/conx-kotlin-reviewers @cedrickcooke @twyatt

build.gradle.kts

@@ -34,14 +34,31 @@ allprojects {
     }
 
     withPluginWhenEvaluated("jacoco") {
+        tasks.register<JacocoReport>("jacocoTestReport") {
+            group = "Verification"
+            description = "Generate JaCoCo test coverage report"
+
+            reports {
+                csv.required.set(false)
+                html.required.set(true)
+                xml.required.set(true)
+            }
+
+            classDirectories.setFrom(layout.buildDirectory.file("classes/kotlin/jvm/main"))
+            sourceDirectories.setFrom(layout.projectDirectory.files("src/commonMain", "src/jvmMain"))
+            executionData.setFrom(layout.buildDirectory.file("jacoco/jvmTest.exec"))
+
+            dependsOn("jvmTest")
+        }
+
         configure<JacocoPluginExtension> {
             toolVersion = libs.versions.jacoco.get()
         }
     }
 }
 
 tasks.dokkaHtmlMultiModule.configure {
-    outputDirectory.set(buildDir.resolve("gh-pages"))
+    outputDirectory.fileProvider(layout.buildDirectory.file("gh-pages").map { it.asFile })
 }
 
 fun Project.withPluginWhenEvaluated(plugin: String, action: Project.() -> Unit) {

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ kotlin = "1.9.22"
 ktor = "2.3.8"
 
 [libraries]
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.7.3" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.8.0" }
 ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 ktor-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }

khronicle-core/build.gradle.kts

@@ -7,8 +7,6 @@ plugins {
     id("com.vanniktech.maven.publish")
 }
 
-apply(from = rootProject.file("gradle/jacoco.gradle.kts"))
-
 kotlin {
     explicitApi()
     jvmToolchain(libs.versions.jvm.toolchain.get().toInt())

khronicle-ktor-client/build.gradle.kts

@@ -7,8 +7,6 @@ plugins {
     id("com.vanniktech.maven.publish")
 }
 
-apply(from = rootProject.file("gradle/jacoco.gradle.kts"))
-
 kotlin {
     explicitApi()
     jvmToolchain(libs.versions.jvm.toolchain.get().toInt())