aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-15 14:26:37 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-15 14:26:37 +0200
commit1f34fb742ceaa941f48ca858010961f834e3d1b8 (patch)
tree76ca87a93cc0cf12e6fc201d34c7e20ad5b510ca /build.gradle
parent4a051b65d1ee004aeea3bcb0a20d0bde1d2200ae (diff)
parent32826ec29d28668b7f345ffcd45cd876dc980153 (diff)
Merge branch 'development'
Diffstat (limited to 'build.gradle')
-rw-r--r--build.gradle11
1 files changed, 7 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle
index 639e9a7f..9e1ac078 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,10 @@ dependencies {
compile 'com.google.zxing:android-integration:3.1.0'
compile 'de.measite.minidns:minidns:0.1.3'
compile 'de.timroes.android:EnhancedListView:0.3.4'
- compile 'me.leolin:ShortcutBadger:1.1.1@aar'
+ compile 'me.leolin:ShortcutBadger:1.1.3@aar'
+ compile 'com.kyleduo.switchbutton:library:1.2.8'
+ compile 'org.whispersystems:axolotl-android:1.3.4'
+ compile 'com.makeramen:roundedimageview:2.1.1'
}
android {
@@ -45,8 +48,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
- versionCode 80
- versionName "1.5.2"
+ versionCode 82
+ versionName "1.6.0-beta.2"
}
compileOptions {
@@ -93,7 +96,7 @@ android {
}
lintOptions {
- disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity'
+ disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
}
subprojects {