diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-11 17:12:07 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-11 17:12:07 +0200 |
commit | baea31847022ce88906a0190638ddffed82c8a7c (patch) | |
tree | cdd080f224a82a377295a02f64f62fb7534012cb /build.gradle | |
parent | c8790f404aaf76db967a16c8fea79eb6f90c8bce (diff) | |
parent | 98ba424576946d2f5ef529c5506113b71b0266c4 (diff) | |
download | open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.gz open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.bz2 open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.zip |
Merge remote-tracking branch 'origin/master' into v/multi-decrypt
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 538fb17f9..f1d71b18f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,10 +5,12 @@ buildscript { 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.android.tools.build:gradle:1.1.3' + classpath 'com.android.tools.build:gradle:1.2.3' classpath files('gradle-witness.jar') // bintray dependency to satisfy dependency of openpgp-api lib classpath 'com.novoda:bintray-release:0.2.7' + + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1' } } @@ -19,7 +21,7 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.3' + gradleVersion = '2.4' } subprojects { @@ -28,7 +30,7 @@ subprojects { } } -// Ignore tests for external dependency +// Ignore tests for external spongycastle project(':extern:spongycastle') { subprojects { // Need to re-apply the plugin here otherwise the test property below can't be set. |