Browse Source

Force JaCoCo version 0.8.7

Fixes crashes with Kotlin 1.5 + Android Gradle Plugin 7.x

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
Álvaro Brey Vilas 3 years ago
parent
commit
6086836f63
1 changed files with 12 additions and 1 deletions
  1. 12 1
      build.gradle

+ 12 - 1
build.gradle

@@ -10,6 +10,7 @@ import org.gradle.internal.jvm.Jvm
 
 
 buildscript {
 buildscript {
     ext.kotlin_version = '1.5.31'
     ext.kotlin_version = '1.5.31'
+    ext.jacoco_version = '0.8.7'
     repositories {
     repositories {
         google()
         google()
         maven {
         maven {
@@ -25,6 +26,9 @@ buildscript {
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.1"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.1"
         classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
         classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
         classpath 'com.karumi:shot:5.11.2'
         classpath 'com.karumi:shot:5.11.2'
+        classpath "org.jacoco:org.jacoco.core:$jacoco_version"
+        classpath "org.jacoco:org.jacoco.report:$jacoco_version"
+        classpath "org.jacoco:org.jacoco.agent:$jacoco_version"
     }
     }
 }
 }
 
 
@@ -379,6 +383,11 @@ configurations.all {
     resolutionStrategy{
     resolutionStrategy{
         cacheChangingModulesFor 0, 'seconds'
         cacheChangingModulesFor 0, 'seconds'
         force 'org.objenesis:objenesis:2.6'
         force 'org.objenesis:objenesis:2.6'
+        eachDependency { details ->
+            if ('org.jacoco' == details.requested.group) {
+                details.useVersion "$jacoco_version"
+            }
+        }
     }
     }
 
 
 }
 }
@@ -398,6 +407,8 @@ android.applicationVariants.all { variant ->
 
 
 tasks.register("combinedTestReport", JacocoReport) {
 tasks.register("combinedTestReport", JacocoReport) {
 
 
+    jacocoClasspath = configurations['jacocoAnt']
+
     reports {
     reports {
         xml.enabled true
         xml.enabled true
         html.enabled true
         html.enabled true
@@ -449,5 +460,5 @@ shot {
 }
 }
 
 
 jacoco {
 jacoco {
-    toolVersion = "0.8.7"
+    toolVersion = "$jacoco_version"
 }
 }