Skip to content

Commit

Permalink
chore: bump kover version (#61)
Browse files Browse the repository at this point in the history
  • Loading branch information
brizzbuzz authored Aug 26, 2022
1 parent f954c6a commit a89a7c9
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.9.2] - August 26th, 2022
### Changed
- Bumped Kover version

## [0.9.1] - August 15th, 2022
### Changed
- Couple misc version bumps
Expand Down
1 change: 1 addition & 0 deletions application-jvm/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
implementation("com.adarshr:gradle-test-logger-plugin:3.2.0")
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0")
implementation("org.jetbrains.kotlinx:kover:0.6.0")
}

gradlePlugin {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import com.adarshr.gradle.testlogger.TestLoggerPlugin
import com.adarshr.gradle.testlogger.theme.ThemeType
import io.gitlab.arturbosch.detekt.DetektPlugin
import io.gitlab.arturbosch.detekt.extensions.DetektExtension
import kotlinx.kover.KoverPlugin
import kotlinx.kover.api.DefaultJacocoEngine
import kotlinx.kover.api.KoverProjectConfig
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.logging.LogLevel
Expand All @@ -22,6 +25,7 @@ class ApplicationJvmPlugin : Plugin<Project> {
target.configureApplication(ext)
target.configureJava(ext)
target.configureKotlin(ext)
target.configureKover()
target.configureTesting()
}

Expand Down Expand Up @@ -65,6 +69,14 @@ class ApplicationJvmPlugin : Plugin<Project> {
}
}

private fun Project.configureKover() {
plugins.withType(KoverPlugin::class.java) {
extensions.configure(KoverProjectConfig::class.java) {
it.engine.set(DefaultJacocoEngine)
}
}
}


private fun Project.configureTesting() {
plugins.withType(TestLoggerPlugin::class.java) {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Project
project.version=0.9.1
project.version=0.9.2

# Kotlin
kotlin.code.style=official
Expand Down
1 change: 1 addition & 0 deletions library-jvm/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dependencies {
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10")
implementation("org.jetbrains.dokka:versioning-plugin:1.7.10")
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0")
implementation("org.jetbrains.kotlinx:kover:0.6.0")
}

gradlePlugin {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import com.adarshr.gradle.testlogger.TestLoggerPlugin
import com.adarshr.gradle.testlogger.theme.ThemeType
import io.gitlab.arturbosch.detekt.DetektPlugin
import io.gitlab.arturbosch.detekt.extensions.DetektExtension
import kotlinx.kover.KoverPlugin
import kotlinx.kover.api.DefaultJacocoEngine
import kotlinx.kover.api.KoverProjectConfig
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.logging.LogLevel
Expand All @@ -29,6 +32,7 @@ class LibraryJvmPlugin : Plugin<Project> {
target.configureDetekt()
target.configureJava(ext)
target.configureKotlin(ext)
target.configureKover()
target.configureTesting()
target.configureDokka()
target.configurePublishing()
Expand Down Expand Up @@ -69,6 +73,14 @@ class LibraryJvmPlugin : Plugin<Project> {
}
}

private fun Project.configureKover() {
plugins.withType(KoverPlugin::class.java) {
extensions.configure(KoverProjectConfig::class.java) {
it.engine.set(DefaultJacocoEngine)
}
}
}

private fun Project.configureTesting() {
plugins.withType(TestLoggerPlugin::class.java) {
extensions.configure(TestLoggerExtension::class.java) {
Expand Down
2 changes: 1 addition & 1 deletion root/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
dependencies {
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10")
implementation("org.jetbrains.dokka:versioning-plugin:1.7.10")
implementation("org.jetbrains.kotlinx:kover:0.5.1")
implementation("org.jetbrains.kotlinx:kover:0.6.0")
implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
}

Expand Down
19 changes: 10 additions & 9 deletions root/src/main/kotlin/io/bkbn/sourdough/gradle/root/RootPlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package io.bkbn.sourdough.gradle.root
import io.github.gradlenexus.publishplugin.NexusPublishExtension
import io.github.gradlenexus.publishplugin.NexusPublishPlugin
import kotlinx.kover.KoverPlugin
import kotlinx.kover.api.CoverageEngine
import kotlinx.kover.api.KoverExtension
import kotlinx.kover.tasks.KoverCollectingTask
import kotlinx.kover.api.DefaultJacocoEngine
import kotlinx.kover.api.KoverMergedConfig
import kotlinx.kover.api.KoverProjectConfig
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
Expand Down Expand Up @@ -72,13 +72,14 @@ class RootPlugin : Plugin<Project> {

private fun Project.configureKover() {
plugins.withType(KoverPlugin::class.java) {
extensions.configure(KoverExtension::class.java) {
it.coverageEngine.set(CoverageEngine.JACOCO)
it.jacocoEngineVersion.set("0.8.7")
it.generateReportOnCheck = true
extensions.configure(KoverProjectConfig::class.java) {
it.engine.set(DefaultJacocoEngine)
}
tasks.withType(KoverCollectingTask::class.java).configureEach {
it.outputDir.set(layout.buildDirectory.dir("kover-report"))
extensions.configure(KoverMergedConfig::class.java) { kmc ->
kmc.enable()
kmc.filters {
// TODO Add filters when resolved -> https://github.com/Kotlin/kotlinx-kover/issues/220
}
}
}
}
Expand Down

0 comments on commit a89a7c9

Please sign in to comment.