diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-12-09 08:58:46 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-12-09 08:58:46 +0100 |
| commit | b4d67da95fbc48f8e64daf54185d290cb40b45d8 (patch) | |
| tree | bbe978445b85c18d6005476d86a304ad37e1b021 /main/project | |
| parent | 27d6b0545626053da1a0ac181c654fc7054d268c (diff) | |
| parent | de5bb30e397456e9dcafd928e6ef8825c742518c (diff) | |
| download | cgeo-b4d67da95fbc48f8e64daf54185d290cb40b45d8.zip cgeo-b4d67da95fbc48f8e64daf54185d290cb40b45d8.tar.gz cgeo-b4d67da95fbc48f8e64daf54185d290cb40b45d8.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/libs/commons-lang3-3.3.2.jar.properties
Diffstat (limited to 'main/project')
| -rwxr-xr-x | main/project/libraries/update-libs.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/main/project/libraries/update-libs.sh b/main/project/libraries/update-libs.sh index 3a0a90c..d41d08d 100755 --- a/main/project/libraries/update-libs.sh +++ b/main/project/libraries/update-libs.sh @@ -1,12 +1,15 @@ #! /bin/sh # -RXJAVA=1.0.1 +RXJAVA=1.0.2 RXANDROID=0.23.0 RXJAVAASYNCUTIL=0.21.0 -JACKSONCORE=2.4.3 -JACKSONDATABIND=2.4.3 -JACKSONANNOTATIONS=2.4.3 +JACKSONCORE=2.4.4 +JACKSONDATABIND=2.4.4 +JACKSONANNOTATIONS=2.4.4 +COMMONSCOLLECTIONS4=4.0 +COMMONSLANG3=3.3.2 +COMMONSIO=2.4 cd $(git rev-parse --show-toplevel)/main/libs @@ -45,3 +48,10 @@ updatelib com/fasterxml/jackson/core jackson-databind $JACKSONDATABIND fixgradle JacksonDatabindVersion $JACKSONDATABIND updatelib com/fasterxml/jackson/core jackson-annotations $JACKSONANNOTATIONS fixgradle JacksonAnnotationsVersion $JACKSONANNOTATIONS + +updatelib org/apache/commons commons-collections4 $COMMONSCOLLECTIONS4 +fixgradle CommonsCollections4Version $COMMONSCOLLECTIONS4 +updatelib org/apache/commons commons-lang3 $COMMONSLANG3 +fixgradle CommonsLang3Version $COMMONSLANG3 +updatelib commons-io commons-io $COMMONSIO +fixgradle CommonsIoVersion $COMMONSIO |