aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/build.gradle9
-rw-r--r--main/libs/jackson-annotations-2.4.1.jarbin0 -> 38604 bytes
-rw-r--r--main/libs/jackson-annotations-2.4.1.jar.properties2
-rw-r--r--main/libs/jackson-core-2.4.1.1.jarbin0 -> 225356 bytes
-rw-r--r--main/libs/jackson-core-2.4.1.1.jar.properties2
-rw-r--r--main/libs/jackson-databind-2.4.1.3.jarbin0 -> 1074135 bytes
-rw-r--r--main/libs/jackson-databind-2.4.1.3.jar.properties2
-rw-r--r--main/libs/src/jackson-annotations-2.4.1-javadoc.jarbin0 -> 268648 bytes
-rw-r--r--main/libs/src/jackson-annotations-2.4.1-sources.jarbin0 -> 42638 bytes
-rw-r--r--main/libs/src/jackson-core-2.4.1.1-javadoc.jarbin0 -> 800071 bytes
-rw-r--r--main/libs/src/jackson-core-2.4.1.1-sources.jarbin0 -> 235209 bytes
-rw-r--r--main/libs/src/jackson-databind-2.4.1.3-javadoc.jarbin0 -> 4055002 bytes
-rw-r--r--main/libs/src/jackson-databind-2.4.1.3-sources.jarbin0 -> 770115 bytes
-rw-r--r--main/proguard-project.txt3
-rwxr-xr-xmain/project/libraries/update-libs.sh10
15 files changed, 27 insertions, 1 deletions
diff --git a/main/build.gradle b/main/build.gradle
index e4f60fe..325af71 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -28,6 +28,9 @@ gradle connectedCheck
def AAVersion = '3.0.1'
def RXVersion = '0.19.6'
+def JacksonCoreVersion = '2.4.1.1'
+def JacksonDatabindVersion = '2.4.1.3'
+def JacksonAnnotationsVersion = '2.4.1'
group = 'cgeo.geocaching'
version = '0.0.1'
@@ -162,6 +165,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')
@@ -357,4 +364,4 @@ task addTest {
// always do the addtest on prebuild
gradle.projectsEvaluated {
preBuild.dependsOn(addTest)
-}*/ \ No newline at end of file
+}*/
diff --git a/main/libs/jackson-annotations-2.4.1.jar b/main/libs/jackson-annotations-2.4.1.jar
new file mode 100644
index 0000000..decd2d1
--- /dev/null
+++ b/main/libs/jackson-annotations-2.4.1.jar
Binary files differ
diff --git a/main/libs/jackson-annotations-2.4.1.jar.properties b/main/libs/jackson-annotations-2.4.1.jar.properties
new file mode 100644
index 0000000..710f903
--- /dev/null
+++ b/main/libs/jackson-annotations-2.4.1.jar.properties
@@ -0,0 +1,2 @@
+src=src/jackson-annotations-2.4.1-sources.jar
+doc=src/jackson-annotations-2.4.1-javadoc.jar
diff --git a/main/libs/jackson-core-2.4.1.1.jar b/main/libs/jackson-core-2.4.1.1.jar
new file mode 100644
index 0000000..5fe10ae
--- /dev/null
+++ b/main/libs/jackson-core-2.4.1.1.jar
Binary files differ
diff --git a/main/libs/jackson-core-2.4.1.1.jar.properties b/main/libs/jackson-core-2.4.1.1.jar.properties
new file mode 100644
index 0000000..0a3222e
--- /dev/null
+++ b/main/libs/jackson-core-2.4.1.1.jar.properties
@@ -0,0 +1,2 @@
+src=src/jackson-core-2.4.1.1-sources.jar
+doc=src/jackson-core-2.4.1.1-javadoc.jar
diff --git a/main/libs/jackson-databind-2.4.1.3.jar b/main/libs/jackson-databind-2.4.1.3.jar
new file mode 100644
index 0000000..231bd1f
--- /dev/null
+++ b/main/libs/jackson-databind-2.4.1.3.jar
Binary files differ
diff --git a/main/libs/jackson-databind-2.4.1.3.jar.properties b/main/libs/jackson-databind-2.4.1.3.jar.properties
new file mode 100644
index 0000000..f4cc029
--- /dev/null
+++ b/main/libs/jackson-databind-2.4.1.3.jar.properties
@@ -0,0 +1,2 @@
+src=src/jackson-databind-2.4.1.3-sources.jar
+doc=src/jackson-databind-2.4.1.3-javadoc.jar
diff --git a/main/libs/src/jackson-annotations-2.4.1-javadoc.jar b/main/libs/src/jackson-annotations-2.4.1-javadoc.jar
new file mode 100644
index 0000000..40bb9d2
--- /dev/null
+++ b/main/libs/src/jackson-annotations-2.4.1-javadoc.jar
Binary files differ
diff --git a/main/libs/src/jackson-annotations-2.4.1-sources.jar b/main/libs/src/jackson-annotations-2.4.1-sources.jar
new file mode 100644
index 0000000..f9e50a4
--- /dev/null
+++ b/main/libs/src/jackson-annotations-2.4.1-sources.jar
Binary files differ
diff --git a/main/libs/src/jackson-core-2.4.1.1-javadoc.jar b/main/libs/src/jackson-core-2.4.1.1-javadoc.jar
new file mode 100644
index 0000000..cfae85e
--- /dev/null
+++ b/main/libs/src/jackson-core-2.4.1.1-javadoc.jar
Binary files differ
diff --git a/main/libs/src/jackson-core-2.4.1.1-sources.jar b/main/libs/src/jackson-core-2.4.1.1-sources.jar
new file mode 100644
index 0000000..0647e10
--- /dev/null
+++ b/main/libs/src/jackson-core-2.4.1.1-sources.jar
Binary files differ
diff --git a/main/libs/src/jackson-databind-2.4.1.3-javadoc.jar b/main/libs/src/jackson-databind-2.4.1.3-javadoc.jar
new file mode 100644
index 0000000..5bab5af
--- /dev/null
+++ b/main/libs/src/jackson-databind-2.4.1.3-javadoc.jar
Binary files differ
diff --git a/main/libs/src/jackson-databind-2.4.1.3-sources.jar b/main/libs/src/jackson-databind-2.4.1.3-sources.jar
new file mode 100644
index 0000000..1bab3a5
--- /dev/null
+++ b/main/libs/src/jackson-databind-2.4.1.3-sources.jar
Binary files differ
diff --git a/main/proguard-project.txt b/main/proguard-project.txt
index 74b8aa2..c6e67fd 100644
--- a/main/proguard-project.txt
+++ b/main/proguard-project.txt
@@ -21,6 +21,9 @@
# rxjava internal references sun.misc.Unsafe
-dontwarn sun.misc.Unsafe
+# jackson internal references
+-dontwarn org.w3c.dom.bootstrap.DOMImplementationRegistry
+
#-dontnote org.apache.commons.logging.**
-keep public class cgeo.geocaching.*
diff --git a/main/project/libraries/update-libs.sh b/main/project/libraries/update-libs.sh
index f2e9ced..bdf25c4 100755
--- a/main/project/libraries/update-libs.sh
+++ b/main/project/libraries/update-libs.sh
@@ -2,6 +2,9 @@
#
RXJAVA=0.19.6
+JACKSONCORE=2.4.1.1
+JACKSONDATABIND=2.4.1.3
+JACKSONANNOTATIONS=2.4.1
cd $(git rev-parse --show-toplevel)/main/libs
@@ -31,3 +34,10 @@ updatelib com/netflix/rxjava rxjava-core $RXJAVA
updatelib com/netflix/rxjava rxjava-android $RXJAVA
updatelib com/netflix/rxjava rxjava-async-util $RXJAVA
fixgradle RXVersion $RXJAVA
+
+updatelib com/fasterxml/jackson/core jackson-core $JACKSONCORE
+fixgradle JacksonCoreVersion $JACKSONCORE
+updatelib com/fasterxml/jackson/core jackson-databind $JACKSONDATABIND
+fixgradle JacksonDatabindVersion $JACKSONDATABIND
+updatelib com/fasterxml/jackson/core jackson-annotations $JACKSONANNOTATIONS
+fixgradle JacksonAnnotationsVersion $JACKSONANNOTATIONS