Configure JaCoCo

build.gradle

@@ -17,8 +17,6 @@ def javaLibraryProjects = [
     project('client:smart-contract')
 ]
 
-apply from: 'gradle/jacoco.gradle'
-
 subprojects {
   apply plugin: 'java'
 }

buildSrc/src/main/groovy/io.aergo.heraj.java-common-conventions.gradle

@@ -27,10 +27,6 @@ tasks.withType(JavaCompile) {
 }
 
 
-// versions of commonly dependent libraries. NOTE: versions of libraries is decleared in gradle.properties
-ext {
-}
-
 /* idea */
 idea {
   module {

buildSrc/src/main/groovy/io.aergo.heraj.java-library-conventions.gradle

@@ -8,7 +8,7 @@ plugins {
 
     // Apply the java-library plugin for API and implementation separation.
     id 'java-library'
-    id 'jacoco'         // coverage
+    id 'jacoco'       // coverage
     id 'checkstyle'
     id 'maven-publish'           // maven
     id 'signing'                 //
@@ -19,6 +19,7 @@ def projectBaseName = 'heraj-' + project.name
 
 // test configuration
 test {
+
   if (java.toolchain.languageVersion.get().canCompileOrRun(JavaLanguageVersion.of("9"))) {
     jvmArgs('--add-opens', 'java.base/java.lang=ALL-UNNAMED')
     jvmArgs('--add-opens', 'java.base/java.lang.reflect=ALL-UNNAMED')
@@ -181,6 +182,12 @@ jacocoTestReport {
     xml.required = true
     html.required = true
   }
+
+  afterEvaluate {
+      classDirectories.setFrom(files(classDirectories.files.collect {
+          fileTree(dir: it, exclude: ['**/types/**'])
+      }))
+  }
 }
 
 task coverage {

core/protobuf/build.gradle

@@ -39,10 +39,6 @@ protobuf {
   }
 }
 
-test {
-  enabled = false
-}
-
 // FIXME: custom disable options, it don't like it
 tasks.withType(Javadoc).all { enabled = false }
 

gradle.properties

@@ -8,7 +8,7 @@ targetJavaVersion=1.8
 
 # build utils
 checkstyleVersion=8.45.1
-jacocoVersion=0.8.9
+jacocoVersion=0.8.12
 jmhPluginVersion=0.6.6
 jmhReportVersion=0.8.0
 shadowJarVersion=8.3.2

report/build.gradle

@@ -8,17 +8,27 @@ repositories {
 }
 
 dependencies {
-    jacocoAggregation project(':client:smart-contract'),project(':client:wallet') // <.>
+    jacocoAggregation([
+            project(':client:smart-contract'),
+            project(':client:wallet')
+    ])
 }
 
 reporting {
     reports {
         testCodeCoverageReport(JacocoCoverageReport) { // <.>
             testType = TestSuiteType.UNIT_TEST
+
+            def classDirectories = reportTask.get().classDirectories
+            classDirectories.setFrom(
+                    classDirectories.files.collect {
+                        fileTree(dir: it, exclude: ['types/**'])
+                    })
         }
     }
 }
 
+
 tasks.named('check') {
     dependsOn tasks.named('testCodeCoverageReport', JacocoReport) // <.>
 }