From 8f5295f2d13e895490813c0ced19cfd738e591ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 4 Dec 2014 19:42:30 +0100
Subject: Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot
 version anymore, jacoco disabled for now

---
 OpenKeychain-Test/build.gradle | 51 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'OpenKeychain-Test')

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 {
-- 
cgit v1.2.3