mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 03:52:15 +02:00
Code

Upgrade JaCoCo to 0.8.3

Browse Source 
Created a variable and used it for the required secondary locations

The project-level version definition is required or jacocoAnt gets the wrong version
The android-block version definition is required or the Jacoco agent is the wrong version
This commit is contained in:
Mike Hardy 2019-01-26 15:41:41 -05:00
parent a0820d3fe3
commit 8b500b2c2c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AnkiDroid/build.gradle
View File

@ -2,6 +2,10 @@ apply plugin: 'com.android.application'
apply plugin: 'com.github.triplet.play'
apply plugin: 'jacoco'
jacoco {
toolVersion = "$rootProject.ext.jacocoVersion"
}
repositories {
google()
jcenter()
@ -61,6 +65,9 @@ android {
}
}
jacoco {
version = "$rootProject.ext.jacocoVersion"
}
dexOptions {
// Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
preDexLibraries = preDexEnabled && !travisBuild

5
build.gradle
View File

@ -9,13 +9,16 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:3.3.0'
classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
classpath "org.jacoco:org.jacoco.core:0.8.2"
classpath "org.jacoco:org.jacoco.core:0.8.3"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
ext {
jacocoVersion = "0.8.3"
travisBuild = System.getenv("TRAVIS") == "true"
// allows for -Dpre-dex=false to be set
preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))