aboutsummaryrefslogtreecommitdiffstats
path: root/main/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'main/build.gradle')
-rw-r--r--main/build.gradle18
1 files changed, 13 insertions, 5 deletions
diff --git a/main/build.gradle b/main/build.gradle
index 7ad61d4..0033acd 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -27,14 +27,17 @@ gradle connectedCheck
//https://github.com/stephanenicolas/Quality-Tools-for-Android
def AAVersion = '3.0.1'
-def RXVersion = '0.19.6'
+def RXVersion = '0.20.0'
+def JacksonCoreVersion = '2.4.1.1'
+def JacksonDatabindVersion = '2.4.1.3'
+def JacksonAnnotationsVersion = '2.4.1'
group = 'cgeo.geocaching'
version = '0.0.1'
android {
compileSdkVersion "Google Inc.:Google APIs:19"
//compileSdkVersion 19
- buildToolsVersion "19.1.0"
+ buildToolsVersion "20"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
@@ -81,8 +84,8 @@ android {
//packageNameSuffix ".debug"
//zipAlign = true
debuggable true
- runProguard false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), '../tests/proguard.cfg'
+ runProguard true
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
versionNameSuffix " Debug " + versionProps['betaNumber']
}
release {
@@ -152,6 +155,7 @@ dependencies {
compile files('libs/mapsforge-map-0.3.0-jar-with-dependencies.jar')
compile 'com.android.support:appcompat-v7:19.1.0'
+ compile 'com.google.android.gms:play-services:5.0.89'
compile 'com.jakewharton:butterknife:5.1.1'
compile 'org.apache.commons:commons-collections4:4.0'
@@ -163,6 +167,10 @@ dependencies {
compile "com.netflix.rxjava:rxjava-android:$RXVersion"
compile "com.netflix.rxjava:rxjava-async-util:$RXVersion"
+ compile "com.fasterxml.jackson.core:jackson-core:$JacksonCoreVersion"
+ compile "com.fasterxml.jackson.core:jackson-databind:$JacksonDatabindVersion"
+ compile "com.fasterxml.jackson.core:jackson-annotations:$JacksonAnnotationsVersion"
+
//TEST
//compile files('compile-libs/androidannotations-3.0.1.jar')
//compile files('compile-libs/findbugs-ant.jar')
@@ -358,4 +366,4 @@ task addTest {
// always do the addtest on prebuild
gradle.projectsEvaluated {
preBuild.dependsOn(addTest)
-}*/ \ No newline at end of file
+}*/