diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-24 13:19:43 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-24 13:19:43 +0100 |
| commit | 040cf42cb07c0bc58aceb048804c6d9359754499 (patch) | |
| tree | 8534be929516f9a2d5a489b8fd9e14d247f1a392 /build.gradle | |
| parent | c694d73cab1edf91cb94d53cc8352ca93f0eb6ce (diff) | |
| parent | eeccd7cd1475f02a9f4650f1debc38ab6a66d866 (diff) | |
| download | open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.tar.gz open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.tar.bz2 open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.zip | |
Merge branch 'development' into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle index 6b3eb2c3d..f76289d49 100644 --- a/build.gradle +++ b/build.gradle @@ -15,14 +15,14 @@ allprojects { jcenter() maven { - // for https://github.com/journeyapps/zxing-android-embedded + // for zxing-android-embedded lib url "http://dl.bintray.com/journeyapps/maven" } } } task wrapper(type: Wrapper) { - gradleVersion = '2.2.1' + gradleVersion = '2.3' } subprojects { @@ -43,6 +43,6 @@ project(':extern:spongycastle') { // SDK Version and Build Tools used by all subprojects // See http://tools.android.com/tech-docs/new-build-system/tips#TOC-Controlling-Android-properties-of-all-your-modules-from-the-main-project. ext { - compileSdkVersion = 21 - buildToolsVersion = '21.1.2' + compileSdkVersion = 22 + buildToolsVersion = '22.0.1' }
\ No newline at end of file |