diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-12-19 11:08:36 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-12-19 11:08:36 +0100 |
| commit | a531a860312059d8a0f7e5e6ff17d733a138b3d4 (patch) | |
| tree | 46170d68bab95b98027ad7d4276db3e429a2a707 | |
| parent | bdab93d9c7ec5dbc8e5acf182abf071579b79f38 (diff) | |
| parent | dcc3298ac6531cf7c975790b83007fac1f1edbd5 (diff) | |
| download | cgeo-a531a860312059d8a0f7e5e6ff17d733a138b3d4.zip cgeo-a531a860312059d8a0f7e5e6ff17d733a138b3d4.tar.gz cgeo-a531a860312059d8a0f7e5e6ff17d733a138b3d4.tar.bz2 | |
Merge branch 'release' into upstream
| -rw-r--r-- | main/build.gradle | 2 | ||||
| -rw-r--r-- | main/libs/rxjava-1.0.2.jar | bin | 680191 -> 0 bytes | |||
| -rw-r--r-- | main/libs/rxjava-1.0.2.jar.properties | 2 | ||||
| -rw-r--r-- | main/libs/rxjava-1.0.3.jar | bin | 0 -> 692531 bytes | |||
| -rw-r--r-- | main/libs/rxjava-1.0.3.jar.properties | 2 | ||||
| -rw-r--r-- | main/libs/src/rxjava-1.0.2-javadoc.jar | bin | 397636 -> 0 bytes | |||
| -rw-r--r-- | main/libs/src/rxjava-1.0.3-javadoc.jar | bin | 0 -> 418984 bytes | |||
| -rw-r--r-- | main/libs/src/rxjava-1.0.3-sources.jar (renamed from main/libs/src/rxjava-1.0.2-sources.jar) | bin | 378170 -> 385648 bytes | |||
| -rwxr-xr-x | main/project/libraries/update-libs.sh | 2 |
9 files changed, 4 insertions, 4 deletions
diff --git a/main/build.gradle b/main/build.gradle index 7352585..f4fe016 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -27,7 +27,7 @@ gradle connectedCheck //https://github.com/stephanenicolas/Quality-Tools-for-Android def AAVersion = '3.2' -def RXJavaVersion = '1.0.2' +def RXJavaVersion = '1.0.3' def RXAndroidVersion = '0.23.0' def RXJavaAsyncUtilVersion = '0.21.0' def JacksonCoreVersion = '2.4.4' diff --git a/main/libs/rxjava-1.0.2.jar b/main/libs/rxjava-1.0.2.jar Binary files differdeleted file mode 100644 index 4362a9f..0000000 --- a/main/libs/rxjava-1.0.2.jar +++ /dev/null diff --git a/main/libs/rxjava-1.0.2.jar.properties b/main/libs/rxjava-1.0.2.jar.properties deleted file mode 100644 index 49609bd..0000000 --- a/main/libs/rxjava-1.0.2.jar.properties +++ /dev/null @@ -1,2 +0,0 @@ -src=src/rxjava-1.0.2-sources.jar -doc=src/rxjava-1.0.2-javadoc.jar diff --git a/main/libs/rxjava-1.0.3.jar b/main/libs/rxjava-1.0.3.jar Binary files differnew file mode 100644 index 0000000..c16ca79 --- /dev/null +++ b/main/libs/rxjava-1.0.3.jar diff --git a/main/libs/rxjava-1.0.3.jar.properties b/main/libs/rxjava-1.0.3.jar.properties new file mode 100644 index 0000000..9814db6 --- /dev/null +++ b/main/libs/rxjava-1.0.3.jar.properties @@ -0,0 +1,2 @@ +src=src/rxjava-1.0.3-sources.jar +doc=src/rxjava-1.0.3-javadoc.jar diff --git a/main/libs/src/rxjava-1.0.2-javadoc.jar b/main/libs/src/rxjava-1.0.2-javadoc.jar Binary files differdeleted file mode 100644 index afebe05..0000000 --- a/main/libs/src/rxjava-1.0.2-javadoc.jar +++ /dev/null diff --git a/main/libs/src/rxjava-1.0.3-javadoc.jar b/main/libs/src/rxjava-1.0.3-javadoc.jar Binary files differnew file mode 100644 index 0000000..d21929d --- /dev/null +++ b/main/libs/src/rxjava-1.0.3-javadoc.jar diff --git a/main/libs/src/rxjava-1.0.2-sources.jar b/main/libs/src/rxjava-1.0.3-sources.jar Binary files differindex 178f8a1..e3d74ce 100644 --- a/main/libs/src/rxjava-1.0.2-sources.jar +++ b/main/libs/src/rxjava-1.0.3-sources.jar diff --git a/main/project/libraries/update-libs.sh b/main/project/libraries/update-libs.sh index d41d08d..460532a 100755 --- a/main/project/libraries/update-libs.sh +++ b/main/project/libraries/update-libs.sh @@ -1,7 +1,7 @@ #! /bin/sh # -RXJAVA=1.0.2 +RXJAVA=1.0.3 RXANDROID=0.23.0 RXJAVAASYNCUTIL=0.21.0 JACKSONCORE=2.4.4 |