diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 23:57:21 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-13 00:27:40 +0200 |
| commit | ca4774fd622131581e7f700a12594ad6fe1263b1 (patch) | |
| tree | 10ad0e6676454a435d45b7dc12d1fd9148aab6a0 /build.gradle | |
| parent | 073433fa747d698c6666081b2ee312062ecf2115 (diff) | |
| parent | 70d454785fc87dfaf8731a6eb7cebe3fc0056e7a (diff) | |
| download | open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.gz open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.bz2 open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.zip | |
Merge remote-tracking branch 'origin/master' into canonicalize
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/res/values/strings.xml
settings.gradle
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 6 |
1 files changed, 3 insertions, 3 deletions
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' } |