diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-08-31 11:31:02 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-08-31 11:31:02 +0200 |
| commit | e57dec8b90e64596e47f4e051847d6cc2b2318f3 (patch) | |
| tree | efa61a9412793db1f45f783c954ae2a6dd3f2322 | |
| parent | 08a1b54befb0465bfbbde70d5ef6bc968d699c7a (diff) | |
| download | cgeo-e57dec8b90e64596e47f4e051847d6cc2b2318f3.zip cgeo-e57dec8b90e64596e47f4e051847d6cc2b2318f3.tar.gz cgeo-e57dec8b90e64596e47f4e051847d6cc2b2318f3.tar.bz2 | |
Upgrade to RxJava 0.20.2
21 files changed, 9 insertions, 8 deletions
diff --git a/google-play-services_lib/google-play-services_lib.iml b/google-play-services_lib/google-play-services_lib.iml index f100970..22663f6 100644 --- a/google-play-services_lib/google-play-services_lib.iml +++ b/google-play-services_lib/google-play-services_lib.iml @@ -10,6 +10,7 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/build" /> </content> diff --git a/main/build.gradle b/main/build.gradle index e5f3381..89258c9 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.0.1' -def RXVersion = '0.20.1' +def RXVersion = '0.20.2' def JacksonCoreVersion = '2.4.1.1' def JacksonDatabindVersion = '2.4.1.3' def JacksonAnnotationsVersion = '2.4.1' diff --git a/main/libs/rxjava-android-0.20.1.jar.properties b/main/libs/rxjava-android-0.20.1.jar.properties deleted file mode 100644 index eb6b5ce..0000000 --- a/main/libs/rxjava-android-0.20.1.jar.properties +++ /dev/null @@ -1,2 +0,0 @@ -src=src/rxjava-android-0.20.1-sources.jar -doc=src/rxjava-android-0.20.1-javadoc.jar diff --git a/main/libs/rxjava-android-0.20.1.jar b/main/libs/rxjava-android-0.20.2.jar Binary files differindex 1995a17..d38a36f 100644 --- a/main/libs/rxjava-android-0.20.1.jar +++ b/main/libs/rxjava-android-0.20.2.jar diff --git a/main/libs/rxjava-android-0.20.2.jar.properties b/main/libs/rxjava-android-0.20.2.jar.properties new file mode 100644 index 0000000..8b4e999 --- /dev/null +++ b/main/libs/rxjava-android-0.20.2.jar.properties @@ -0,0 +1,2 @@ +src=src/rxjava-android-0.20.2-sources.jar +doc=src/rxjava-android-0.20.2-javadoc.jar diff --git a/main/libs/rxjava-async-util-0.20.1.jar.properties b/main/libs/rxjava-async-util-0.20.1.jar.properties deleted file mode 100644 index a0f7787..0000000 --- a/main/libs/rxjava-async-util-0.20.1.jar.properties +++ /dev/null @@ -1,2 +0,0 @@ -src=src/rxjava-async-util-0.20.1-sources.jar -doc=src/rxjava-async-util-0.20.1-javadoc.jar diff --git a/main/libs/rxjava-async-util-0.20.1.jar b/main/libs/rxjava-async-util-0.20.2.jar Binary files differindex 9420be4..8dc4982 100644 --- a/main/libs/rxjava-async-util-0.20.1.jar +++ b/main/libs/rxjava-async-util-0.20.2.jar diff --git a/main/libs/rxjava-async-util-0.20.2.jar.properties b/main/libs/rxjava-async-util-0.20.2.jar.properties new file mode 100644 index 0000000..f9b0524 --- /dev/null +++ b/main/libs/rxjava-async-util-0.20.2.jar.properties @@ -0,0 +1,2 @@ +src=src/rxjava-async-util-0.20.2-sources.jar +doc=src/rxjava-async-util-0.20.2-javadoc.jar diff --git a/main/libs/rxjava-core-0.20.1.jar.properties b/main/libs/rxjava-core-0.20.1.jar.properties deleted file mode 100644 index d779d6c..0000000 --- a/main/libs/rxjava-core-0.20.1.jar.properties +++ /dev/null @@ -1,2 +0,0 @@ -src=src/rxjava-core-0.20.1-sources.jar -doc=src/rxjava-core-0.20.1-javadoc.jar diff --git a/main/libs/rxjava-core-0.20.1.jar b/main/libs/rxjava-core-0.20.2.jar Binary files differindex 2f00a01..fda98cc 100644 --- a/main/libs/rxjava-core-0.20.1.jar +++ b/main/libs/rxjava-core-0.20.2.jar diff --git a/main/libs/rxjava-core-0.20.2.jar.properties b/main/libs/rxjava-core-0.20.2.jar.properties new file mode 100644 index 0000000..7da0271 --- /dev/null +++ b/main/libs/rxjava-core-0.20.2.jar.properties @@ -0,0 +1,2 @@ +src=src/rxjava-core-0.20.2-sources.jar +doc=src/rxjava-core-0.20.2-javadoc.jar diff --git a/main/libs/src/rxjava-android-0.20.1-javadoc.jar b/main/libs/src/rxjava-android-0.20.1-javadoc.jar Binary files differdeleted file mode 100644 index 965e5dd..0000000 --- a/main/libs/src/rxjava-android-0.20.1-javadoc.jar +++ /dev/null diff --git a/main/libs/src/rxjava-android-0.20.2-javadoc.jar b/main/libs/src/rxjava-android-0.20.2-javadoc.jar Binary files differnew file mode 100644 index 0000000..fd093ca --- /dev/null +++ b/main/libs/src/rxjava-android-0.20.2-javadoc.jar diff --git a/main/libs/src/rxjava-android-0.20.1-sources.jar b/main/libs/src/rxjava-android-0.20.2-sources.jar Binary files differindex 0cd1330..4f836c7 100644 --- a/main/libs/src/rxjava-android-0.20.1-sources.jar +++ b/main/libs/src/rxjava-android-0.20.2-sources.jar diff --git a/main/libs/src/rxjava-async-util-0.20.1-javadoc.jar b/main/libs/src/rxjava-async-util-0.20.1-javadoc.jar Binary files differdeleted file mode 100644 index 33939d3..0000000 --- a/main/libs/src/rxjava-async-util-0.20.1-javadoc.jar +++ /dev/null diff --git a/main/libs/src/rxjava-async-util-0.20.2-javadoc.jar b/main/libs/src/rxjava-async-util-0.20.2-javadoc.jar Binary files differnew file mode 100644 index 0000000..89d3096 --- /dev/null +++ b/main/libs/src/rxjava-async-util-0.20.2-javadoc.jar diff --git a/main/libs/src/rxjava-async-util-0.20.1-sources.jar b/main/libs/src/rxjava-async-util-0.20.2-sources.jar Binary files differindex 050291c..21a32c4 100644 --- a/main/libs/src/rxjava-async-util-0.20.1-sources.jar +++ b/main/libs/src/rxjava-async-util-0.20.2-sources.jar diff --git a/main/libs/src/rxjava-core-0.20.1-javadoc.jar b/main/libs/src/rxjava-core-0.20.1-javadoc.jar Binary files differdeleted file mode 100644 index 8b9c146..0000000 --- a/main/libs/src/rxjava-core-0.20.1-javadoc.jar +++ /dev/null diff --git a/main/libs/src/rxjava-core-0.20.2-javadoc.jar b/main/libs/src/rxjava-core-0.20.2-javadoc.jar Binary files differnew file mode 100644 index 0000000..26d69fe --- /dev/null +++ b/main/libs/src/rxjava-core-0.20.2-javadoc.jar diff --git a/main/libs/src/rxjava-core-0.20.1-sources.jar b/main/libs/src/rxjava-core-0.20.2-sources.jar Binary files differindex fac6a2e..1d63878 100644 --- a/main/libs/src/rxjava-core-0.20.1-sources.jar +++ b/main/libs/src/rxjava-core-0.20.2-sources.jar diff --git a/main/project/libraries/update-libs.sh b/main/project/libraries/update-libs.sh index 3cfd7e1..1a80f70 100755 --- a/main/project/libraries/update-libs.sh +++ b/main/project/libraries/update-libs.sh @@ -1,7 +1,7 @@ #! /bin/sh # -RXJAVA=0.20.1 +RXJAVA=0.20.2 JACKSONCORE=2.4.1.1 JACKSONDATABIND=2.4.1.3 JACKSONANNOTATIONS=2.4.1 |
