fix: documentation and jacoco reports

* fix: adopt documentation * fix: fix jacoco report with additional jars
triplem · Mar 9, 2021 · b80434a · b80434a
1 parent e33b9e4
commit b80434a
Show file tree

Hide file tree

Showing 7 changed files with 226 additions and 98 deletions.
diff --git a/README.adoc b/README.adoc
@@ -17,3 +17,5 @@ endif::[]
 image:{img-semantic-release}[Semantic Release Badge,link={uri-semantic-release}]
 image:{img-sonarcloud}[Sonarcloud Status,link={uri-sonarcloud}]
 image:{img-actions}[CI Workflow]
+
+link:https://github.com/users/triplem/packages/container/package/gradle-by-example[docker package]
diff --git a/buildSrc/src/main/kotlin/org.javafreedom.kotlin-common-conventions.gradle.kts b/buildSrc/src/main/kotlin/org.javafreedom.kotlin-common-conventions.gradle.kts
@@ -52,7 +52,8 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
     // Add additonal dependencies useful for development
-    //implementation("io.github.microutils:kotlin-logging:2.0.4")
+    implementation("io.github.microutils:kotlin-logging:2.0.4")
+    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.23")
     testImplementation(kotlin("test"))
     testImplementation(kotlin("test-junit5"))
 

diff --git a/...rc/src/main/kotlin/org/javafreedom/documentation/asciidoc-producer-conventions.gradle.kts b/...rc/src/main/kotlin/org/javafreedom/documentation/asciidoc-producer-conventions.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 val revDate = System.getenv()["revdate"] ?: LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))

diff --git a/buildSrc/src/main/kotlin/org/javafreedom/verification/jacoco-consumer-conventions.gradle.kts b/buildSrc/src/main/kotlin/org/javafreedom/verification/jacoco-consumer-conventions.gradle.kts
@@ -54,7 +54,9 @@ val coverageClassPath: Configuration by configurations.creating {
 val aggregateJacocoTestReport by tasks.registering(JacocoReport::class) {
     additionalClassDirs(coverageClassPath.incoming.artifactView { lenient(true) }.files)
     additionalSourceDirs(sourcesPath.incoming.artifactView { lenient(true) }.files)
-    executionData(coverageDataPath.incoming.artifactView { lenient(true) }.files.filter { it.exists() })
+    executionData(coverageDataPath.incoming.artifactView { lenient(true) }
+        .files.filter { it.exists() }
+        .filter { it.extension == "exec" })
 
     reports {
         // xml is usually used to integrate code coverage with

diff --git a/documentation/docs/index.adoc b/documentation/docs/index.adoc
diff --git a/modules/list/list.gradle.kts b/modules/list/list.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.23")
+
 }
diff --git a/modules/list/src/test/kotlin/org/javafreedom/list/LinkedListTest.kt b/modules/list/src/test/kotlin/org/javafreedom/list/LinkedListTest.kt
@@ -5,8 +5,11 @@ package org.javafreedom.list
 
 import assertk.assertThat
 import assertk.assertions.*
+import mu.KotlinLogging
 import kotlin.test.Test
 
+private val logger = KotlinLogging.logger {}
+
 class LinkedListTest {
 
     @Test fun testConstructor() {
@@ -17,6 +20,8 @@ class LinkedListTest {
     @Test fun testAdd() {
         val list = LinkedList()
 
+        logger.debug { "Just a test for log messages" }
+
         list.add("one")
         assertThat(list.size()).isEqualTo(1)
         assertThat(list.get(0)).isEqualTo("one")
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,5 @@ plugins { @@
     }
     dependencies {
-        testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.23")
     }