diff options
Diffstat (limited to 'main/project')
| -rw-r--r-- | main/project/libraries/pom.xml | 20 | ||||
| -rwxr-xr-x | main/project/libraries/update-libs.sh | 11 |
2 files changed, 11 insertions, 20 deletions
diff --git a/main/project/libraries/pom.xml b/main/project/libraries/pom.xml index a86c3c7..b59d4af 100644 --- a/main/project/libraries/pom.xml +++ b/main/project/libraries/pom.xml @@ -18,7 +18,7 @@ <properties> <AndroidAnnotationsVersion>3.2</AndroidAnnotationsVersion> - <ButterKnifeVersion>6.0.0</ButterKnifeVersion> + <ButterKnifeVersion>6.1.0</ButterKnifeVersion> <CommonsCollections4Version>4.0</CommonsCollections4Version> <CommonsIoVersion>2.4</CommonsIoVersion> @@ -26,13 +26,12 @@ <FindbugsAnnotationsVersion>3.0.0</FindbugsAnnotationsVersion> - <JacksonAnnotationsVersion>2.4.4</JacksonAnnotationsVersion> - <JacksonCoreVersion>2.4.4</JacksonCoreVersion> - <JacksonDatabindVersion>2.4.4</JacksonDatabindVersion> + <JacksonAnnotationsVersion>2.5.1</JacksonAnnotationsVersion> + <JacksonCoreVersion>2.5.1</JacksonCoreVersion> + <JacksonDatabindVersion>2.5.1</JacksonDatabindVersion> - <RXAndroidVersion>0.23.0</RXAndroidVersion> - <RXJavaVersion>1.0.3</RXJavaVersion> - <RXJavaAsyncUtilVersion>0.21.0</RXJavaAsyncUtilVersion> + <RXAndroidVersion>0.24.0</RXAndroidVersion> + <RXJavaVersion>1.0.7</RXJavaVersion> </properties> <dependencies> @@ -98,11 +97,6 @@ </dependency> <dependency> <groupId>io.reactivex</groupId> - <artifactId>rxjava-async-util</artifactId> - <version>${RXJavaAsyncUtilVersion}</version> - </dependency> - <dependency> - <groupId>io.reactivex</groupId> <artifactId>rxandroid</artifactId> <version>${RXAndroidVersion}</version> </dependency> @@ -125,7 +119,7 @@ </execution> <execution> <id>update-properties</id> - <phase>install</phase> + <phase>package</phase> <goals> <goal>update-properties</goal> </goals> diff --git a/main/project/libraries/update-libs.sh b/main/project/libraries/update-libs.sh index b49dbef..4c66254 100755 --- a/main/project/libraries/update-libs.sh +++ b/main/project/libraries/update-libs.sh @@ -1,12 +1,11 @@ #! /bin/sh # -RXJAVA=1.0.4 +RXJAVA=1.0.8 RXANDROID=0.24.0 -RXJAVAASYNCUTIL=0.21.0 -JACKSONCORE=2.4.4 -JACKSONDATABIND=2.4.4 -JACKSONANNOTATIONS=2.4.4 +JACKSONCORE=2.5.1 +JACKSONDATABIND=2.5.1 +JACKSONANNOTATIONS=2.5.1 COMMONSCOLLECTIONS4=4.0 COMMONSLANG3=3.3.2 COMMONSIO=2.4 @@ -39,8 +38,6 @@ updatelib io/reactivex rxjava $RXJAVA fixgradle RXJavaVersion $RXJAVA updatelib io/reactivex rxandroid $RXANDROID fixgradle RXAndroidVersion $RXANDROID -updatelib io/reactivex rxjava-async-util $RXJAVAASYNCUTIL -fixgradle RXJavaAsyncUtilVersion $RXJAVAASYNCUTIL updatelib com/fasterxml/jackson/core jackson-core $JACKSONCORE fixgradle JacksonCoreVersion $JACKSONCORE |