aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-08-11 17:35:53 +0200
committerlookshe <github@lookshe.org>2015-08-11 17:35:53 +0200
commit8fd688ca96005152be754eeba1be72c7c0aab9ad (patch)
treec4d2e3dfe7250a6794aaa3fa9816ad3da70a813e /build.gradle
parent553f41a2dbc068a8a43f613e088713cd3ec7680e (diff)
Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1
Diffstat (limited to 'build.gradle')
-rw-r--r--build.gradle14
1 files changed, 8 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index 3b765998..130fa6b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.1'
+ classpath 'com.android.tools.build:gradle:1.2.3'
}
}
@@ -34,19 +34,21 @@ dependencies {
compile 'com.google.zxing:core:3.1.0'
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 project(':libs:emojicon')
compile project(':libs:colorpicker')
}
android {
- compileSdkVersion 21
- buildToolsVersion "21.1.2"
+ compileSdkVersion 22
+ buildToolsVersion "22.0.1"
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
- versionCode 63
- versionName "1.2.6"
+ versionCode 64
+ versionName "1.5.2.1"
}
compileOptions {
@@ -93,7 +95,7 @@ android {
}
lintOptions {
- disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage'
+ disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity'
}
subprojects {