Update JaCoCo reports

MarcusAdriano · Jun 23, 2020 · 29ad782 · 29ad782
1 parent ac6f5a7
commit 29ad782
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ dist: trusty
 jdk: oraclejdk8
 
 script:
-  - ./gradlew build jacocoTestReport
+  - ./gradlew build
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/build.gradle b/build.gradle
@@ -13,9 +13,6 @@ repositories {
 }
 
 test {
-    exclude 'io/github/marcusadriano/brawlstars/model/**'
-    exclude 'io/github/marcusadriano/brawlstars/examples/**'
-
     // listen to events in the test execution lifecycle
     beforeTest { descriptor ->
         logger.lifecycle("Running test: " + descriptor)
@@ -28,34 +25,45 @@ test {
     useJUnitPlatform()
 }
 
+def jacocoExcludes = [
+    'io/github/marcusadriano/brawlstars/model/**'
+]
+
+def jacocoRulesExcludes = [
+        'io.github.marcusadriano.brawlstars.model.**'
+]
+
 jacocoTestCoverageVerification {
     violationRules {
         rule {
+            element = 'METHOD'
+            excludes = jacocoRulesExcludes
             limit {
+                counter = 'BRANCH'
                 minimum = 0.9
             }
         }
     }
 }
 
 jacocoTestReport {
-    dependsOn test
-    dependsOn jacocoTestCoverageVerification
     reports {
         xml.enabled true
         csv.enabled false
         html.enabled true
     }
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {
-            fileTree(dir: it, exclude: [
-                'io/github/marcusadriano/brawlstars/examples/**',
-                'io/github/marcusadriano/brawlstars/model/**'
-            ])
+            fileTree(dir: it, exclude: jacocoExcludes)
         }))
     }
 }
 
+check {
+    dependsOn jacocoTestCoverageVerification
+    dependsOn jacocoTestReport
+}
+
 compileKotlin {
     kotlinOptions.jvmTarget = "1.8"
     kotlinOptions {