diff --git a/admin-endpoint/build.gradle.kts b/admin-endpoint/build.gradle.kts index 4a13c6d5d..e16ad95e0 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/appleid-auth-service/build.gradle.kts b/appleid-auth-service/build.gradle.kts index 768d49edc..f077d3af7 100644 --- a/appleid-auth-service/build.gradle.kts +++ b/appleid-auth-service/build.gradle.kts @@ -31,4 +31,4 @@ tasks.withType { 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 index 618331bf8..fc02349fb 100644 --- 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 index 600455f60..5ce6150d4 100644 --- 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 index 986b3d610..7b71ca916 100644 --- a/customer-endpoint/build.gradle.kts +++ b/customer-endpoint/build.gradle.kts @@ -25,4 +25,4 @@ dependencies { } } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/customer-support-endpoint/build.gradle.kts b/customer-support-endpoint/build.gradle.kts index 4a13c6d5d..e16ad95e0 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/data-store/build.gradle.kts b/data-store/build.gradle.kts index 6635574e0..cb3dc5694 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/dataflow-pipelines/build.gradle.kts b/dataflow-pipelines/build.gradle.kts index 3581f69d3..a7cfe120c 100644 --- a/dataflow-pipelines/build.gradle.kts +++ b/dataflow-pipelines/build.gradle.kts @@ -54,4 +54,4 @@ tasks.test { } } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/diameter-ha/build.gradle.kts b/diameter-ha/build.gradle.kts index 5c9e26b0e..5df14a317 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/diameter-stack/build.gradle.kts b/diameter-stack/build.gradle.kts index 97d397e90..bafde004e 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/document-data-store/build.gradle.kts b/document-data-store/build.gradle.kts index 2d275e1bd..6c13f3ccd 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/ekyc/build.gradle.kts b/ekyc/build.gradle.kts index a4cf59eb6..3d04acc71 100644 --- a/ekyc/build.gradle.kts +++ b/ekyc/build.gradle.kts @@ -37,4 +37,4 @@ tasks.test { } } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/email-notifier/build.gradle.kts b/email-notifier/build.gradle.kts index f42376003..af10f2800 100644 --- a/email-notifier/build.gradle.kts +++ b/email-notifier/build.gradle.kts @@ -35,4 +35,4 @@ tasks.test { } } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/ext-auth-provider/build.gradle.kts b/ext-auth-provider/build.gradle.kts index 383623ea8..e74ace227 100644 --- a/ext-auth-provider/build.gradle.kts +++ b/ext-auth-provider/build.gradle.kts @@ -34,4 +34,4 @@ tasks.withType { archiveVersion.set("") } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/ext-myinfo-emulator/build.gradle.kts b/ext-myinfo-emulator/build.gradle.kts index 84dff7ab6..d4d3b3c33 100644 --- a/ext-myinfo-emulator/build.gradle.kts +++ b/ext-myinfo-emulator/build.gradle.kts @@ -35,4 +35,4 @@ tasks.withType { archiveVersion.set("") } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle deleted file mode 100644 index 1f506a14f..000000000 --- a/gradle/jacoco.gradle +++ /dev/null @@ -1,11 +0,0 @@ -jacocoTestReport { - group = "Reporting" - description = "Generate Jacoco coverage reports after running tests." - getAdditionalSourceDirs().from(files(sourceSets.main.allJava.srcDirs)) - reports { - xml.enabled = true - html.enabled = true - } -} - -check.dependsOn jacocoTestReport \ No newline at end of file diff --git a/gradle/jacoco.gradle.kts b/gradle/jacoco.gradle.kts new file mode 100644 index 000000000..22a95747a --- /dev/null +++ b/gradle/jacoco.gradle.kts @@ -0,0 +1,15 @@ +tasks { + named("jacocoTestReport") { + group = "Reporting" + description = "Generate Jacoco coverage reports after running tests." + additionalSourceDirs.from(files(project.the()["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")) \ No newline at end of file diff --git a/graphql/build.gradle.kts b/graphql/build.gradle.kts index 3707258ec..3825d11a6 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/imei-lookup/build.gradle.kts b/imei-lookup/build.gradle.kts index edfc6e0d8..b265a9197 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/jersey/build.gradle.kts b/jersey/build.gradle.kts index 69d8af8c3..446370f32 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/kts-engine/build.gradle.kts b/kts-engine/build.gradle.kts index ceba37144..fd49560a8 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts index 8d7eaa4e6..963beaf8c 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/neo4j-store/build.gradle.kts b/neo4j-store/build.gradle.kts index fe474adf4..e675bd518 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/ocs-ktc/build.gradle.kts b/ocs-ktc/build.gradle.kts index a2fec0b9b..1b6b870ec 100644 --- a/ocs-ktc/build.gradle.kts +++ b/ocs-ktc/build.gradle.kts @@ -19,4 +19,4 @@ dependencies { } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/ocsgw/build.gradle.kts b/ocsgw/build.gradle.kts index 7e66859d4..06d5a447b 100644 --- a/ocsgw/build.gradle.kts +++ b/ocsgw/build.gradle.kts @@ -63,4 +63,4 @@ tasks.test { } } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/payment-processor/build.gradle.kts b/payment-processor/build.gradle.kts index d5c9aa66d..4c341fb37 100644 --- 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 index 176019bb7..b75488bb0 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/scaninfo-datastore/build.gradle.kts b/scaninfo-datastore/build.gradle.kts index b516f07bf..b45583f93 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/scaninfo-shredder/build.gradle.kts b/scaninfo-shredder/build.gradle.kts index 4593b1668..451fca29c 100644 --- a/scaninfo-shredder/build.gradle.kts +++ b/scaninfo-shredder/build.gradle.kts @@ -53,4 +53,4 @@ tasks.register("version") { } } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") diff --git a/secure-archive/build.gradle.kts b/secure-archive/build.gradle.kts index 80314f7df..e801c7987 100644 --- 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") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/sim-administration/es2plus4dropwizard/build.gradle.kts b/sim-administration/es2plus4dropwizard/build.gradle.kts index 5310dbf4e..22561d5c5 100644 --- 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") \ No newline at end of file +apply(from = "../../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/sim-administration/hss-adapter/build.gradle.kts b/sim-administration/hss-adapter/build.gradle.kts index fdfece202..ce45b2637 100644 --- 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 index f148894e9..439fcce34 100644 --- 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") \ No newline at end of file +apply(from = "../../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/sim-administration/ostelco-dropwizard-utils/build.gradle.kts b/sim-administration/ostelco-dropwizard-utils/build.gradle.kts index 747437a94..9dc256d31 100644 --- 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") \ No newline at end of file +apply(from = "../../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/sim-administration/simcard-utils/build.gradle.kts b/sim-administration/simcard-utils/build.gradle.kts index ccc84137f..01e127e0c 100644 --- 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") \ No newline at end of file +apply(from = "../../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/sim-administration/simmanager/build.gradle.kts b/sim-administration/simmanager/build.gradle.kts index 2626b4ca3..0fcc4ee65 100644 --- 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 index d1c858103..eab37890d 100644 --- 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 { archiveVersion.set("") } -apply(from = "../../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/slack/build.gradle.kts b/slack/build.gradle.kts index 95ca400ac..bc9b06390 100644 --- a/slack/build.gradle.kts +++ b/slack/build.gradle.kts @@ -35,4 +35,4 @@ tasks.test { } } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file diff --git a/tracing/build.gradle.kts b/tracing/build.gradle.kts index 08471e6b3..6e8ace845 100644 --- a/tracing/build.gradle.kts +++ b/tracing/build.gradle.kts @@ -31,4 +31,4 @@ tasks.test { } } -apply(from = "../gradle/jacoco.gradle") \ No newline at end of file +apply(from = "../gradle/jacoco.gradle.kts") \ No newline at end of file