From 6bdc88083675602369f1a94e2c3644fcf1af108a Mon Sep 17 00:00:00 2001 From: Drew Carlson Date: Thu, 19 Oct 2023 09:43:40 -0700 Subject: [PATCH] Update dependencies --- .github/workflows/tests.yml | 6 +++--- build.gradle.kts | 9 ++++++++- gradle/libs.versions.toml | 12 ++++++------ kjob-core/api/kjob-core.api | 2 ++ 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7b9f6c3..7d50e7f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,14 +51,14 @@ jobs: - name: Build with Gradle uses: gradle/gradle-build-action@v2 with: - arguments: build koverMergedXmlReport + arguments: build koverXmlReport - name: Archive Reports uses: actions/upload-artifact@v3 if: ${{ always() }} with: name: reports - path: '**/build/reports/*' + path: "build/reports/kover/report.xml" - name: Publish Unit Test Results uses: mikepenz/action-junit-report@v4 @@ -68,4 +68,4 @@ jobs: - uses: codecov/codecov-action@v3 with: - files: "build/reports/kover/merged/xml/report.xml" + files: "report.xml" diff --git a/build.gradle.kts b/build.gradle.kts index 5a7f9eb..ef300c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,7 +76,14 @@ subprojects { } } -koverMerged { enable() } +dependencies { + kover(project(":kjob-api")) + kover(project(":kjob-core")) + kover(project(":kjob-inmem")) + kover(project(":kjob-jdbi")) + kover(project(":kjob-kron")) + kover(project(":kjob-mongo")) +} project(":kjob-example") { apply(plugin = "kotlinx-serialization") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1735f69..567419f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -kotlin = "1.8.21" +kotlin = "1.9.10" coroutines = "1.7.3" serialization = "1.6.0" -kover = "0.6.1" +kover = "0.7.4" datetime = "0.4.1" dokka = "1.9.10" binary_compat = "0.13.2" -jdbi = "3.41.0" -jdbc_sqlite = "3.42.0.0" +jdbi = "3.41.3" +jdbc_sqlite = "3.43.2.1" jdbc_postgres = "42.6.0" jdbc_mysql = "8.1.0" @@ -16,7 +16,7 @@ logback = "1.4.11" spotless = "6.16.0" ktlint = "0.47.1" -testLogger = "3.2.0" +testLogger = "4.0.0" mockk = "1.13.8" kotest = "5.7.2" cronutils = "9.2.1" @@ -58,7 +58,7 @@ kotest-runner = { module = "io.kotest:kotest-runner-junit5", version.ref = "kote kotest-assertions = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" } cronutils = { module = "com.cronutils:cron-utils", version.ref = "cronutils" } embedMongo = { module = "de.flapdoodle.embed:de.flapdoodle.embed.mongo", version = "4.9.2" } -mongodbReactive = { module = "org.mongodb:mongodb-driver-reactivestreams", version = "4.10.2" } +mongodbReactive = { module = "org.mongodb:mongodb-driver-reactivestreams", version = "4.11.0" } rxjava = { module = "io.reactivex.rxjava2:rxkotlin", version = "2.4.0" } ktor-serialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktorio" } diff --git a/kjob-core/api/kjob-core.api b/kjob-core/api/kjob-core.api index c70e913..280d333 100644 --- a/kjob-core/api/kjob-core.api +++ b/kjob-core/api/kjob-core.api @@ -287,6 +287,7 @@ public abstract class kjob/core/internal/scheduler/SimplePeriodScheduler { public final class kjob/core/job/JobExecutionType : java/lang/Enum { public static final field BLOCKING Lkjob/core/job/JobExecutionType; public static final field NON_BLOCKING Lkjob/core/job/JobExecutionType; + public static fun getEntries ()Lkotlin/enums/EnumEntries; public static fun valueOf (Ljava/lang/String;)Lkjob/core/job/JobExecutionType; public static fun values ()[Lkjob/core/job/JobExecutionType; } @@ -339,6 +340,7 @@ public final class kjob/core/job/JobStatus : java/lang/Enum { public static final field FAILED Lkjob/core/job/JobStatus; public static final field RUNNING Lkjob/core/job/JobStatus; public static final field SCHEDULED Lkjob/core/job/JobStatus; + public static fun getEntries ()Lkotlin/enums/EnumEntries; public static fun valueOf (Ljava/lang/String;)Lkjob/core/job/JobStatus; public static fun values ()[Lkjob/core/job/JobStatus; }