From 9443ede0d8ad1e41070925587254263a4237ea14 Mon Sep 17 00:00:00 2001 From: ogaclejapan Date: Thu, 22 Aug 2024 13:37:16 +0900 Subject: [PATCH 1/2] Add kover plugin --- Makefile | 4 +++ build.gradle.kts | 27 +++++++++++++++++++++ gradle/libs.versions.toml | 2 ++ soil-form/build.gradle.kts | 9 +++++++ soil-query-compose-runtime/build.gradle.kts | 9 +++++++ soil-query-compose/build.gradle.kts | 9 +++++++ soil-query-core/build.gradle.kts | 9 +++++++ soil-query-receivers/ktor/build.gradle.kts | 9 +++++++ soil-query-test/build.gradle.kts | 9 +++++++ soil-serialization-bundle/build.gradle.kts | 10 ++++++++ soil-space/build.gradle.kts | 9 +++++++ 11 files changed, 106 insertions(+) diff --git a/Makefile b/Makefile index ad7909d..1ce9a3d 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ test: fmt: @$(GRADLE_CMD) spotlessApply +.PHONY: kover +kover: + @$(GRADLE_CMD) koverHtmlReport + .PHONY: dokka dokka: @$(GRADLE_CMD) dokkaHtmlMultiModule diff --git a/build.gradle.kts b/build.gradle.kts index bf694b9..47d2b3c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,6 +11,7 @@ plugins { alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.maven.publish) apply false alias(libs.plugins.dokka) + alias(libs.plugins.kover) alias(libs.plugins.spotless) } @@ -68,3 +69,29 @@ allprojects { } } } + +kover { + currentProject { + createVariant("soil") { + + } + } + reports { + filters { + excludes { + androidGeneratedClasses() + } + } + } +} + +dependencies { + kover(projects.soilQueryCore) + kover(projects.soilQueryCompose) + kover(projects.soilQueryComposeRuntime) + kover(projects.soilQueryReceivers.ktor) + kover(projects.soilQueryTest) + kover(projects.soilSerializationBundle) + kover(projects.soilForm) + kover(projects.soilSpace) +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7ee25ee..bf42953 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,6 +21,7 @@ junit = "4.13.2" kotlin = "2.0.20" kotlinx-coroutines = "1.8.1" kotlinx-serialization = "1.7.0" +kover = "0.8.3" ktor = "3.0.0-beta-2" maven-publish = "0.28.0" robolectric = "4.12.2" @@ -67,5 +68,6 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } diff --git a/soil-form/build.gradle.kts b/soil-form/build.gradle.kts index a9eb39a..6efa806 100644 --- a/soil-form/build.gradle.kts +++ b/soil-form/build.gradle.kts @@ -7,6 +7,7 @@ plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.maven.publish) alias(libs.plugins.dokka) + alias(libs.plugins.kover) } val buildTarget = the() @@ -93,3 +94,11 @@ composeCompiler { reportsDestination = buildTarget.composeCompilerDestination } } + +kover { + currentProject { + createVariant("soil") { + add("debug") + } + } +} diff --git a/soil-query-compose-runtime/build.gradle.kts b/soil-query-compose-runtime/build.gradle.kts index 55d5724..87f2e14 100644 --- a/soil-query-compose-runtime/build.gradle.kts +++ b/soil-query-compose-runtime/build.gradle.kts @@ -7,6 +7,7 @@ plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.maven.publish) alias(libs.plugins.dokka) + alias(libs.plugins.kover) } val buildTarget = the() @@ -77,3 +78,11 @@ composeCompiler { reportsDestination = buildTarget.composeCompilerDestination } } + +kover { + currentProject { + createVariant("soil") { + add("debug") + } + } +} diff --git a/soil-query-compose/build.gradle.kts b/soil-query-compose/build.gradle.kts index 3b4c9f5..1bbc44c 100644 --- a/soil-query-compose/build.gradle.kts +++ b/soil-query-compose/build.gradle.kts @@ -8,6 +8,7 @@ plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.maven.publish) alias(libs.plugins.dokka) + alias(libs.plugins.kover) } val buildTarget = the() @@ -108,3 +109,11 @@ composeCompiler { reportsDestination = buildTarget.composeCompilerDestination } } + +kover { + currentProject { + createVariant("soil") { + add("debug") + } + } +} diff --git a/soil-query-core/build.gradle.kts b/soil-query-core/build.gradle.kts index fc234c0..e52c41c 100644 --- a/soil-query-core/build.gradle.kts +++ b/soil-query-core/build.gradle.kts @@ -5,6 +5,7 @@ plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.maven.publish) alias(libs.plugins.dokka) + alias(libs.plugins.kover) } val buildTarget = the() @@ -93,3 +94,11 @@ android { debugImplementation(libs.compose.ui.tooling) } } + +kover { + currentProject { + createVariant("soil") { + add("debug") + } + } +} diff --git a/soil-query-receivers/ktor/build.gradle.kts b/soil-query-receivers/ktor/build.gradle.kts index b63255d..eebe310 100644 --- a/soil-query-receivers/ktor/build.gradle.kts +++ b/soil-query-receivers/ktor/build.gradle.kts @@ -5,6 +5,7 @@ plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.maven.publish) alias(libs.plugins.dokka) + alias(libs.plugins.kover) } val buildTarget = the() @@ -64,3 +65,11 @@ android { unitTests.isIncludeAndroidResources = true } } + +kover { + currentProject { + createVariant("soil") { + add("debug") + } + } +} diff --git a/soil-query-test/build.gradle.kts b/soil-query-test/build.gradle.kts index bf43fa7..6e99fd6 100644 --- a/soil-query-test/build.gradle.kts +++ b/soil-query-test/build.gradle.kts @@ -5,6 +5,7 @@ plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.maven.publish) alias(libs.plugins.dokka) + alias(libs.plugins.kover) } val buildTarget = the() @@ -70,3 +71,11 @@ android { unitTests.isIncludeAndroidResources = true } } + +kover { + currentProject { + createVariant("soil") { + add("debug") + } + } +} diff --git a/soil-serialization-bundle/build.gradle.kts b/soil-serialization-bundle/build.gradle.kts index 830720c..885ad43 100644 --- a/soil-serialization-bundle/build.gradle.kts +++ b/soil-serialization-bundle/build.gradle.kts @@ -6,6 +6,7 @@ plugins { alias(libs.plugins.kotlin.serialization) alias(libs.plugins.maven.publish) alias(libs.plugins.dokka) + alias(libs.plugins.kover) } val buildTarget = the() @@ -72,3 +73,12 @@ android { debugImplementation(libs.compose.ui.tooling) } } + +kover { + currentProject { + createVariant("soil") { + add("debug") + } + } +} + diff --git a/soil-space/build.gradle.kts b/soil-space/build.gradle.kts index 0fa60e6..82c3b57 100644 --- a/soil-space/build.gradle.kts +++ b/soil-space/build.gradle.kts @@ -8,6 +8,7 @@ plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.maven.publish) alias(libs.plugins.dokka) + alias(libs.plugins.kover) } val buildTarget = the() @@ -110,3 +111,11 @@ composeCompiler { reportsDestination = buildTarget.composeCompilerDestination } } + +kover { + currentProject { + createVariant("soil") { + add("debug") + } + } +} From 7607a715ec02b86b8fec99c91c8b6047e625ecc2 Mon Sep 17 00:00:00 2001 From: ogaclejapan Date: Sun, 25 Aug 2024 01:56:30 +0000 Subject: [PATCH 2/2] Apply automatic changes --- soil-serialization-bundle/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/soil-serialization-bundle/build.gradle.kts b/soil-serialization-bundle/build.gradle.kts index 885ad43..5cd1f25 100644 --- a/soil-serialization-bundle/build.gradle.kts +++ b/soil-serialization-bundle/build.gradle.kts @@ -81,4 +81,3 @@ kover { } } } -