diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-04 19:43:41 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-04 19:43:41 +0100 |
| commit | 389d191448a3caf6d809552e9af63a62b9695bd3 (patch) | |
| tree | f048ab23f812a5472ec17944dd2e7e9683253f5e /OpenKeychain-Test | |
| parent | a805069c59586775fd5790c00cbd82f4dfeddcb6 (diff) | |
| parent | 8f5295f2d13e895490813c0ced19cfd738e591ac (diff) | |
| download | open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.tar.gz open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.tar.bz2 open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.zip | |
Merge branch 'master' into development
Diffstat (limited to 'OpenKeychain-Test')
| -rw-r--r-- | OpenKeychain-Test/build.gradle | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/OpenKeychain-Test/build.gradle b/OpenKeychain-Test/build.gradle index bb6c3d181..83932161f 100644 --- a/OpenKeychain-Test/build.gradle +++ b/OpenKeychain-Test/build.gradle @@ -1,14 +1,11 @@ buildscript { repositories { - mavenCentral() - // need this for com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT below (0.9.3 in repos doesn't work!) - // run ./install-custom-gradle-test-plugin.sh to pull the thing into the local repository - mavenLocal() + jcenter() } dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information - classpath 'com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT' + classpath 'com.novoda:gradle-android-test-plugin:0.10.0' } } @@ -50,28 +47,30 @@ android { projectUnderTest ':OpenKeychain' } -jacoco { - toolVersion = "0.7.0.201403182114" -} - -coverageSourceDirs = [ - '../OpenKeychain/src/main/java', - '../OpenKeychain/src/gen', - '../OpenKeychain/build/source/apt/debug', - '../OpenKeychain/build/source/generated/buildConfig/debug', - '../OpenKeychain/build/source/generated/r/debug' - ] +//jacoco { +// //toolVersion = "0.7.0.201403182114" +// toolVersion = "0.7.2.201409121644" +//} +// +// +//coverageSourceDirs = [ +// '../OpenKeychain/src/main/java', +// '../OpenKeychain/src/gen', +// '../OpenKeychain/build/source/apt/debug', +// '../OpenKeychain/build/source/generated/buildConfig/debug', +// '../OpenKeychain/build/source/generated/r/debug' +// ] -jacocoTestReport { - reports { - xml.enabled = true - html.destination "${buildDir}/jacocoHtml" - } - // class R is used, but usage will not be covered, so ignore this class from report - classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ]) - additionalSourceDirs = files(coverageSourceDirs) - executionData = files('build/jacoco/testDebug.exec') -} +//jacocoTestReport { +// reports { +// xml.enabled = true +// html.destination "${buildDir}/jacocoHtml" +// } +// // class R is used, but usage will not be covered, so ignore this class from report +// classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ]) +// additionalSourceDirs = files(coverageSourceDirs) +// executionData = files('build/jacoco/testDebug.exec') +//} // new workaround to force add custom output dirs for android studio task addTest { |