diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-09 22:09:30 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-09 22:09:30 +0200 |
commit | cb3c2b20086bbce4f338e458a00ab18e4dccc99f (patch) | |
tree | 810f0c5b932e56b1f4092d9735f8025eaf1d5a4f | |
parent | de6fe46ecab01a55e20ba7e7479c31bf20f51af6 (diff) | |
download | open-keychain-cb3c2b20086bbce4f338e458a00ab18e4dccc99f.tar.gz open-keychain-cb3c2b20086bbce4f338e458a00ab18e4dccc99f.tar.bz2 open-keychain-cb3c2b20086bbce4f338e458a00ab18e4dccc99f.zip |
Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12
-rw-r--r-- | OpenKeychain/build.gradle | 8 | ||||
-rw-r--r-- | build.gradle | 6 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index a9c7aa282..dca9faba6 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'android' -apply plugin: 'android-test' +//apply plugin: 'android-test' sourceSets { - androidTest { - java.srcDir file('src/test/java') + //androidTest { + //java.srcDir file('src/test/java') // configure the set of classes for JUnit tests // include '**/*Test.class' - } + //} } dependencies { diff --git a/build.gradle b/build.gradle index 815a8ff9a..e3cafe3ce 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ 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:0.10.0' - classpath 'org.robolectric.gradle:gradle-android-test-plugin:0.10.0' + classpath 'com.android.tools.build:gradle:0.11.1' + //classpath 'org.robolectric.gradle:gradle-android-test-plugin:0.10.0' } } @@ -17,5 +17,5 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '1.10' + gradleVersion = '1.12' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d8e0b5b29..cc3d5d9a3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 06 22:23:44 CET 2014 +#Mon Jun 09 22:04:23 CEST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip |