diff --git a/.idea/misc.xml b/.idea/misc.xml index 4ca4d4d..65b80ca 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,7 +9,7 @@ - + diff --git a/build.gradle.kts b/build.gradle.kts index ddf0399..008cf81 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,14 +6,14 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { id("application") id("com.github.ben-manes.versions") version "0.39.0" - id("io.gitlab.arturbosch.detekt") version "1.18.1" - id("jacoco") + id("io.gitlab.arturbosch.detekt") version "1.19.0-RC1" id("java") id("maven-publish") - id("org.jetbrains.dokka") version "1.5.30" + id("org.jetbrains.dokka") version "1.5.31" + id("org.jetbrains.kotlinx.kover") version "0.4.2" id("org.sonarqube") version "3.3" id("signing") - kotlin("jvm") version "1.5.31" + kotlin("jvm") version "1.6.0" } defaultTasks(ApplicationPlugin.TASK_RUN_NAME) @@ -40,7 +40,6 @@ dependencies { implementation("org.json:json:20210307") testImplementation(kotlin("test")) - testImplementation(kotlin("test-junit")) } application { @@ -63,6 +62,8 @@ sonarqube { property("sonar.organization", "ethauvin-github") property("sonar.host.url", "https://sonarcloud.io") property("sonar.sourceEncoding", "UTF-8") + property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/kover/report.xml") + } } @@ -92,18 +93,6 @@ tasks { destination = file("$projectDir/pom.xml") } - jacoco { - toolVersion = "0.8.7" - } - - jacocoTestReport { - dependsOn(test) - reports { - xml.required.set(true) - html.required.set(true) - } - } - clean { doLast { project.delete(fileTree(deployDir)) @@ -136,7 +125,7 @@ tasks { } "sonarqube" { - dependsOn(jacocoTestReport) + dependsOn(koverReport) } } diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 66b1622..18c85ce 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("application") id("com.github.ben-manes.versions") version "0.39.0" - kotlin("jvm") version "1.5.31" + kotlin("jvm") version "1.6.0" } // ./gradlew run diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index ffed3a2..e750102 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..e750102 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists