diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 1bec35e..7d0d0ad 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,15 @@ + + diff --git a/.idea/copyright/Erik_s_Copyright_Notice.xml b/.idea/copyright/Erik_s_Copyright_Notice.xml index 08660a1..0b64fd2 100644 --- a/.idea/copyright/Erik_s_Copyright_Notice.xml +++ b/.idea/copyright/Erik_s_Copyright_Notice.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/LICENSE.TXT b/LICENSE.TXT index 15551d4..695e358 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,4 +1,4 @@ -Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net) +Copyright (c) 2020-2022, Erik C. Thauvin (erik@thauvin.net) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/build.gradle.kts b/build.gradle.kts index 7ee6731..9bd4410 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,16 +4,16 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { - id("com.github.ben-manes.versions") version "0.39.0" - id("io.gitlab.arturbosch.detekt") version "1.18.1" - id("jacoco") - id("java") + id("com.github.ben-manes.versions") version "0.40.0" + id("io.gitlab.arturbosch.detekt") version "1.19.0" id("java-library") + id("java") id("maven-publish") - id("org.jetbrains.dokka") version "1.5.30" + id("org.jetbrains.dokka") version "1.6.10" + id("org.jetbrains.kotlinx.kover") version "0.4.4" id("org.sonarqube") version "3.3" id("signing") - kotlin("jvm") version "1.5.31" + kotlin("jvm") version "1.6.10" } description = "Estimated Reading Time for Blog Posts, Articles, etc." @@ -57,6 +57,7 @@ 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") } } @@ -82,18 +83,6 @@ tasks { destination = file("$projectDir/pom.xml") } - jacoco { - toolVersion = "0.8.7" - } - - jacocoTestReport { - dependsOn(test) - reports { - xml.required.set(true) - html.required.set(true) - } - } - assemble { dependsOn(javadocJar) } @@ -152,7 +141,7 @@ tasks { } "sonarqube" { - dependsOn(jacocoTestReport) + dependsOn(koverReport) } } diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index a62e7ce..1248e5a 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -2,8 +2,8 @@ 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" + id("com.github.ben-manes.versions") version "0.40.0" + kotlin("jvm") version "1.6.10" } // ./gradlew run diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index ffed3a2..2e6e589 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.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..2e6e589 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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/net/thauvin/erik/readingtime/ReadingTime.kt b/src/main/kotlin/net/thauvin/erik/readingtime/ReadingTime.kt index fae54f6..fbcc356 100644 --- a/src/main/kotlin/net/thauvin/erik/readingtime/ReadingTime.kt +++ b/src/main/kotlin/net/thauvin/erik/readingtime/ReadingTime.kt @@ -1,7 +1,7 @@ /* * ReadingTime.kt * - * Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net) + * Copyright (c) 2020-2022, Erik C. Thauvin (erik@thauvin.net) * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/test/kotlin/net/thauvin/erik/readingtime/ReadingTimeTest.kt b/src/test/kotlin/net/thauvin/erik/readingtime/ReadingTimeTest.kt index a8e1c81..1de3ccf 100644 --- a/src/test/kotlin/net/thauvin/erik/readingtime/ReadingTimeTest.kt +++ b/src/test/kotlin/net/thauvin/erik/readingtime/ReadingTimeTest.kt @@ -1,7 +1,7 @@ /* * ReadingTimeTest.kt * - * Copyright (c) 2020, Erik C. Thauvin (erik@thauvin.net) + * Copyright (c) 2020-2022, Erik C. Thauvin (erik@thauvin.net) * All rights reserved. * * Redistribution and use in source and binary forms, with or without