Ported jacoco.gradle to kts.

ostelco · Oct 13, 2019 · 235b9df · 235b9df
1 parent 0c51785
commit 235b9df
Show file tree

Hide file tree

Showing 39 changed files with 52 additions and 48 deletions.
diff --git a/admin-endpoint/build.gradle.kts b/admin-endpoint/build.gradle.kts
@@ -12,4 +12,4 @@ dependencies {
   testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/appleid-auth-service/build.gradle.kts b/appleid-auth-service/build.gradle.kts
@@ -31,4 +31,4 @@ tasks.withType<ShadowJar> {
   archiveVersion.set("")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/auth-server/build.gradle.kts b/auth-server/build.gradle.kts
@@ -59,7 +59,7 @@ val integration = tasks.create("integration", Test::class.java) {
 tasks.build.get().dependsOn(integration)
 integration.mustRunAfter(tasks.test)
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
 
 idea {
   module {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -33,7 +33,7 @@ allprojects {
   }
 
   jacoco {
-    toolVersion = "0.8.2"
+    toolVersion = "0.8.4"
   }
 }
 

diff --git a/customer-endpoint/build.gradle.kts b/customer-endpoint/build.gradle.kts
@@ -25,4 +25,4 @@ dependencies {
   }
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/customer-support-endpoint/build.gradle.kts b/customer-support-endpoint/build.gradle.kts
@@ -12,4 +12,4 @@ dependencies {
   testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/data-store/build.gradle.kts b/data-store/build.gradle.kts
@@ -22,4 +22,4 @@ dependencies {
   testImplementation("org.mockito:mockito-core:${Version.mockito}")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/dataflow-pipelines/build.gradle.kts b/dataflow-pipelines/build.gradle.kts
@@ -54,4 +54,4 @@ tasks.test {
   }
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/diameter-ha/build.gradle.kts b/diameter-ha/build.gradle.kts
@@ -25,4 +25,4 @@ dependencies {
   testImplementation("org.mockito:mockito-all:1.10.19")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/diameter-stack/build.gradle.kts b/diameter-stack/build.gradle.kts
@@ -30,4 +30,4 @@ dependencies {
   testImplementation("org.mockito:mockito-all:1.10.19")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/document-data-store/build.gradle.kts b/document-data-store/build.gradle.kts
@@ -11,4 +11,4 @@ dependencies {
   testImplementation(kotlin("test-junit"))
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/ekyc/build.gradle.kts b/ekyc/build.gradle.kts
@@ -37,4 +37,4 @@ tasks.test {
   }
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/email-notifier/build.gradle.kts b/email-notifier/build.gradle.kts
@@ -35,4 +35,4 @@ tasks.test {
   }
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/ext-auth-provider/build.gradle.kts b/ext-auth-provider/build.gradle.kts
@@ -34,4 +34,4 @@ tasks.withType<ShadowJar> {
   archiveVersion.set("")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/ext-myinfo-emulator/build.gradle.kts b/ext-myinfo-emulator/build.gradle.kts
@@ -35,4 +35,4 @@ tasks.withType<ShadowJar> {
   archiveVersion.set("")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
diff --git a/gradle/jacoco.gradle.kts b/gradle/jacoco.gradle.kts
@@ -0,0 +1,15 @@
+tasks {
+    named<JacocoReport>("jacocoTestReport") {
+        group = "Reporting"
+        description = "Generate Jacoco coverage reports after running tests."
+        additionalSourceDirs.from(files(project.the<SourceSetContainer>()["main"].allJava.srcDirs))
+        reports {
+            xml.isEnabled = true
+            csv.isEnabled = false
+            html.isEnabled = true
+            html.destination = file("${buildDir}/jacocoHtml")
+        }
+    }
+}
+
+tasks.named("check").get().dependsOn(tasks.named("jacocoTestReport"))
diff --git a/graphql/build.gradle.kts b/graphql/build.gradle.kts
@@ -24,4 +24,4 @@ dependencies {
   testRuntimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/imei-lookup/build.gradle.kts b/imei-lookup/build.gradle.kts
@@ -14,4 +14,4 @@ dependencies {
   testImplementation(kotlin("test-junit"))
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/jersey/build.gradle.kts b/jersey/build.gradle.kts
@@ -15,4 +15,4 @@ dependencies {
   testRuntimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/kts-engine/build.gradle.kts b/kts-engine/build.gradle.kts
@@ -24,4 +24,4 @@ dependencies {
   testImplementation("org.mockito:mockito-core:${Version.mockito}")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
@@ -14,4 +14,4 @@ dependencies {
   implementation("com.fasterxml.jackson.core:jackson-databind:${Version.jacksonDatabind}")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/neo4j-store/build.gradle.kts b/neo4j-store/build.gradle.kts
@@ -22,4 +22,4 @@ dependencies {
   testImplementation("org.mockito:mockito-core:${Version.mockito}")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/ocs-ktc/build.gradle.kts b/ocs-ktc/build.gradle.kts
@@ -19,4 +19,4 @@ dependencies {
 
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/ocsgw/build.gradle.kts b/ocsgw/build.gradle.kts
@@ -63,4 +63,4 @@ tasks.test {
   }
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/payment-processor/build.gradle.kts b/payment-processor/build.gradle.kts
@@ -42,7 +42,7 @@ configurations.named("integrationImplementation") {
 
 tasks.build.get().dependsOn(integration)
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
 
 idea {
   module {

diff --git a/prime-modules/build.gradle.kts b/prime-modules/build.gradle.kts
@@ -34,4 +34,4 @@ dependencies {
   testImplementation(kotlin("test-junit"))
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/scaninfo-datastore/build.gradle.kts b/scaninfo-datastore/build.gradle.kts
@@ -26,4 +26,4 @@ dependencies {
   testImplementation("org.mockito:mockito-core:${Version.mockito}")
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/scaninfo-shredder/build.gradle.kts b/scaninfo-shredder/build.gradle.kts
@@ -53,4 +53,4 @@ tasks.register("version") {
   }
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/secure-archive/build.gradle.kts b/secure-archive/build.gradle.kts
@@ -19,4 +19,4 @@ dependencies {
   testImplementation(kotlin("test-junit"))
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/sim-administration/es2plus4dropwizard/build.gradle.kts b/sim-administration/es2plus4dropwizard/build.gradle.kts
@@ -17,4 +17,4 @@ dependencies {
   testImplementation("org.mockito:mockito-core:${Version.mockito}")
 }
 
-apply(from = "../../gradle/jacoco.gradle")
+apply(from = "../../gradle/jacoco.gradle.kts")
diff --git a/sim-administration/hss-adapter/build.gradle.kts b/sim-administration/hss-adapter/build.gradle.kts
@@ -100,7 +100,7 @@ protobuf {
   protobufGeneratedFilesBaseDir = generatedFilesBaseDir
 }
 
-apply(from = "../../gradle/jacoco.gradle")
+apply(from = "../../gradle/jacoco.gradle.kts")
 
 idea {
   module {

diff --git a/sim-administration/jersey-json-schema-validator/build.gradle.kts b/sim-administration/jersey-json-schema-validator/build.gradle.kts
@@ -14,4 +14,4 @@ dependencies {
   testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
 }
 
-apply(from = "../../gradle/jacoco.gradle")
+apply(from = "../../gradle/jacoco.gradle.kts")
diff --git a/sim-administration/ostelco-dropwizard-utils/build.gradle.kts b/sim-administration/ostelco-dropwizard-utils/build.gradle.kts
@@ -29,4 +29,4 @@ dependencies {
   testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
 }
 
-apply(from = "../../gradle/jacoco.gradle")
+apply(from = "../../gradle/jacoco.gradle.kts")
diff --git a/sim-administration/simcard-utils/build.gradle.kts b/sim-administration/simcard-utils/build.gradle.kts
@@ -11,4 +11,4 @@ dependencies {
   testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
 }
 
-apply(from = "../../gradle/jacoco.gradle")
+apply(from = "../../gradle/jacoco.gradle.kts")
diff --git a/sim-administration/simmanager/build.gradle.kts b/sim-administration/simmanager/build.gradle.kts
@@ -125,7 +125,7 @@ protobuf {
   protobufGeneratedFilesBaseDir = generatedFilesBaseDir
 }
 
-apply(from = "../../gradle/jacoco.gradle")
+apply(from = "../../gradle/jacoco.gradle.kts")
 
 idea {
   module {

diff --git a/sim-administration/sm-dp-plus-emulator/build.gradle.kts b/sim-administration/sm-dp-plus-emulator/build.gradle.kts
@@ -44,4 +44,4 @@ tasks.withType<ShadowJar> {
   archiveVersion.set("")
 }
 
-apply(from = "../../gradle/jacoco.gradle")
+apply(from = "../../gradle/jacoco.gradle.kts")
diff --git a/slack/build.gradle.kts b/slack/build.gradle.kts
@@ -35,4 +35,4 @@ tasks.test {
   }
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
diff --git a/tracing/build.gradle.kts b/tracing/build.gradle.kts
@@ -31,4 +31,4 @@ tasks.test {
   }
 }
 
-apply(from = "../gradle/jacoco.gradle")
+apply(from = "../gradle/jacoco.gradle.kts")
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ allprojects { @@
       }
       jacoco {
-        toolVersion = "0.8.2"
+        toolVersion = "0.8.4"
       }
     }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ dependencies {

		}

		apply(from = "../gradle/jacoco.gradle")
		apply(from = "../gradle/jacoco.gradle.kts")