changes in gradle to use jacoco multi-module

rybalkinsd · Jul 15, 2019 · 579f57a · 579f57a
1 parent 503358b
commit 579f57a
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 32 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,25 +1,26 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.3.40" apply false
+    kotlin("jvm") version "1.3.40"
+
     jacoco
     id("org.jetbrains.dokka") version "0.9.16"
     `maven-publish`
     signing
 }
 
 allprojects {
+    apply(plugin = "jacoco")
+
     group = "io.github.rybalkinsd"
     version = "0.11.0-SNAPSHOT"
 
-
     repositories {
         mavenCentral()
         mavenLocal()
     }
 }
 
-
 val notToPublish = listOf("kohttp-test")
 
 subprojects {
@@ -36,16 +37,6 @@ subprojects {
         getByName("test").java.srcDirs("src/main/kotlin")
     }
 
-
-
-//    val dokkaJar by tasks
-
-    val dokkaJar = task<Jar>("dokkaJar") {
-        group = JavaBasePlugin.DOCUMENTATION_GROUP
-//        from(tasks.dokka)
-        classifier = "javadoc"
-    }
-
     if (project.name !in notToPublish) {
         apply(plugin = "org.jetbrains.dokka")
         apply(plugin = "maven-publish")
@@ -56,6 +47,11 @@ subprojects {
             classifier = "sources"
         }
 
+        val dokkaJar = task<Jar>("dokkaJar") {
+            group = JavaBasePlugin.DOCUMENTATION_GROUP
+            classifier = "javadoc"
+        }
+
         publishing {
             publications {
                 create<MavenPublication>("kohttp") {
@@ -109,20 +105,32 @@ subprojects {
             }
         }
 
-
-
         signing {
             sign(publishing.publications["kohttp"])
         }
     }
 
-
 }
 
+
 tasks.withType<JacocoReport> {
+    val containers = subprojects.map { it.the<SourceSetContainer>()["main"] }
+
+    val output = containers.flatMap { it.output }
+    val sources = containers.flatMap { it.allSource.srcDirs }
+
+    val exec = subprojects.flatMap { it.tasks }
+        .filter { it is Test }
+        .flatMap { files(it) }
+        .filter { it.exists() && it.name.endsWith(".exec") }
+
+    additionalSourceDirs.setFrom(sources)
+    sourceDirectories.setFrom(sources)
+    classDirectories.setFrom(output)
+    executionData.setFrom(exec)
+
     reports {
-        xml.isEnabled = true
-        xml.destination = File("$buildDir/reports/jacoco/report.xml")
-        html.isEnabled = false
+        xml.isEnabled = false
+        html.isEnabled = true
     }
 }
diff --git a/...thub/rybalkinsd/kohttp/ext/ResponseExt.kt → ...alkinsd/kohttp/jackson/ext/ResponseExt.kt b/...thub/rybalkinsd/kohttp/ext/ResponseExt.kt → ...alkinsd/kohttp/jackson/ext/ResponseExt.kt
@@ -1,4 +1,4 @@
-package io.github.rybalkinsd.kohttp.ext
+package io.github.rybalkinsd.kohttp.jackson.ext
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper

diff --git a/...ybalkinsd/kohttp/ext/ResponseExtKtTest.kt → ...d/kohttp/jackson/ext/ResponseExtKtTest.kt b/...ybalkinsd/kohttp/ext/ResponseExtKtTest.kt → ...d/kohttp/jackson/ext/ResponseExtKtTest.kt
@@ -1,5 +1,6 @@
-package io.github.rybalkinsd.kohttp.ext
+package io.github.rybalkinsd.kohttp.jackson.ext
 
+import io.github.rybalkinsd.kohttp.ext.httpGet
 import io.github.rybalkinsd.kohttp.util.json
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpDeleteDslKtTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpDeleteDslKtTest.kt
@@ -1,8 +1,9 @@
 package io.github.rybalkinsd.kohttp.dsl
 
+import io.github.rybalkinsd.kohttp.dsl.httpDelete
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import io.github.rybalkinsd.kohttp.assertContainsAtLeast
 import io.github.rybalkinsd.kohttp.assertContainsExactly
-import io.github.rybalkinsd.kohttp.ext.asJson
 import org.junit.Test
 import kotlin.test.assertEquals
 

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpGetDslKtTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpGetDslKtTest.kt
@@ -1,9 +1,10 @@
 package io.github.rybalkinsd.kohttp.dsl
 
+import io.github.rybalkinsd.kohttp.dsl.httpGet
+import io.github.rybalkinsd.kohttp.ext.url
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import io.github.rybalkinsd.kohttp.assertContainsAtLeast
 import io.github.rybalkinsd.kohttp.assertContainsExactly
-import io.github.rybalkinsd.kohttp.ext.asJson
-import io.github.rybalkinsd.kohttp.ext.url
 import io.github.rybalkinsd.kohttp.util.json
 import org.junit.Test
 import kotlin.test.assertEquals

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpMultipartDslTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpMultipartDslTest.kt
@@ -1,6 +1,7 @@
 package io.github.rybalkinsd.kohttp.dsl
 
-import io.github.rybalkinsd.kohttp.ext.asJson
+import io.github.rybalkinsd.kohttp.dsl.httpPost
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import org.junit.Test
 import java.io.File
 import kotlin.test.assertEquals

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpPatchDslKtTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpPatchDslKtTest.kt
@@ -1,9 +1,9 @@
 package io.github.rybalkinsd.kohttp.dsl
 
+import io.github.rybalkinsd.kohttp.dsl.httpPatch
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import io.github.rybalkinsd.kohttp.assertContainsAtLeast
 import io.github.rybalkinsd.kohttp.assertContainsExactly
-import io.github.rybalkinsd.kohttp.ext.asJson
-
 import org.junit.Test
 import kotlin.test.assertEquals
 

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpPostDslKtTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpPostDslKtTest.kt
@@ -1,8 +1,9 @@
 package io.github.rybalkinsd.kohttp.dsl
 
+import io.github.rybalkinsd.kohttp.dsl.httpPost
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import io.github.rybalkinsd.kohttp.assertContainsAtLeast
 import io.github.rybalkinsd.kohttp.assertContainsExactly
-import io.github.rybalkinsd.kohttp.ext.asJson
 import org.junit.Test
 import java.io.File
 import kotlin.test.assertEquals

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpPutDslKtTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/HttpPutDslKtTest.kt
@@ -1,8 +1,9 @@
 package io.github.rybalkinsd.kohttp.dsl
 
+import io.github.rybalkinsd.kohttp.dsl.httpPut
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import io.github.rybalkinsd.kohttp.assertContainsAtLeast
 import io.github.rybalkinsd.kohttp.assertContainsExactly
-import io.github.rybalkinsd.kohttp.ext.asJson
 import org.junit.Test
 import kotlin.test.assertEquals
 

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/UploadDslKtTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/UploadDslKtTest.kt
@@ -1,7 +1,9 @@
 package io.github.rybalkinsd.kohttp.dsl
 
+import io.github.rybalkinsd.kohttp.dsl.httpGet
+import io.github.rybalkinsd.kohttp.dsl.upload
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import io.github.rybalkinsd.kohttp.assertContainsAtLeast
-import io.github.rybalkinsd.kohttp.ext.asJson
 import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/async/UploadAsyncDslTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/dsl/async/UploadAsyncDslTest.kt
@@ -1,6 +1,7 @@
 package io.github.rybalkinsd.kohttp.dsl.async
 
-import io.github.rybalkinsd.kohttp.ext.asJson
+import io.github.rybalkinsd.kohttp.dsl.async.uploadAsync
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Test

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/ext/FileAsyncExtTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/ext/FileAsyncExtTest.kt
@@ -1,5 +1,7 @@
 package io.github.rybalkinsd.kohttp.ext
 
+import io.github.rybalkinsd.kohttp.ext.uploadAsync
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import java.io.File

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/ext/FileExtTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/ext/FileExtTest.kt
@@ -1,5 +1,7 @@
 package io.github.rybalkinsd.kohttp.ext
 
+import io.github.rybalkinsd.kohttp.ext.upload
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import org.junit.Test
 import java.io.File
 import java.net.URL

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/ext/UriAsyncExtTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/ext/UriAsyncExtTest.kt
@@ -1,5 +1,7 @@
 package io.github.rybalkinsd.kohttp.ext
 
+import io.github.rybalkinsd.kohttp.ext.uploadAsync
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import java.net.URL

diff --git a/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/ext/UriExtKtTest.kt b/kohttp-test/src/test/kotlin/io/github/rybalkinsd/kohttp/ext/UriExtKtTest.kt
@@ -1,5 +1,7 @@
 package io.github.rybalkinsd.kohttp.ext
 
+import io.github.rybalkinsd.kohttp.ext.upload
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import org.junit.Test
 import java.net.URL
 import kotlin.test.assertEquals

diff --git a/...p-test/src/test/kotlin/io/github/rybalkinsd/kohttp/interceptors/SigningInterceptorTest.kt b/...p-test/src/test/kotlin/io/github/rybalkinsd/kohttp/interceptors/SigningInterceptorTest.kt
@@ -3,7 +3,8 @@ package io.github.rybalkinsd.kohttp.interceptors
 import io.github.rybalkinsd.kohttp.client.defaultHttpClient
 import io.github.rybalkinsd.kohttp.client.fork
 import io.github.rybalkinsd.kohttp.dsl.httpGet
-import io.github.rybalkinsd.kohttp.ext.asJson
+import io.github.rybalkinsd.kohttp.interceptors.SigningInterceptor
+import io.github.rybalkinsd.kohttp.jackson.ext.asJson
 import org.junit.Test
 import java.security.MessageDigest
 import java.util.*