Upgrade to RxJava releases 1.x

26 files changed, 24 insertions, 17 deletions

diff --git a/main/build.gradle b/main/build.gradle
index 8b4f4d3..6784a54 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -27,7 +27,9 @@ gradle connectedCheck
 //https://github.com/stephanenicolas/Quality-Tools-for-Android
 
 def AAVersion = '3.2'
-def RXVersion = '0.20.7'
+def RXJavaVersion = '1.0.0'
+def RXAndroidVersion = '0.23.0'
+def RXJavaAsyncUtilVersion = '0.21.0'
 def JacksonCoreVersion = '2.4.3'
 def JacksonDatabindVersion = '2.4.3'
 def JacksonAnnotationsVersion = '2.4.3'
@@ -161,9 +163,9 @@ dependencies {
     compile 'commons-io:commons-io:2.4'
     compile 'com.google.code.findbugs:annotations:3.0.0'
 
-    compile "com.netflix.rxjava:rxjava-core:$RXVersion"
-    compile "com.netflix.rxjava:rxjava-android:$RXVersion"
-    compile "com.netflix.rxjava:rxjava-async-util:$RXVersion"
+    compile "io.reactivex.rxjava:rxjava:$RXJavaVersion"
+    compile "io.reactivex.rxandroid:rxandroid:$RXAndroidVersion"
+    compile "io.reactivex.rxjava-async-util:rxjava-async-util:$RXJavaAsyncUtilVersion"
 
     compile "com.fasterxml.jackson.core:jackson-core:$JacksonCoreVersion"
     compile "com.fasterxml.jackson.core:jackson-databind:$JacksonDatabindVersion"
diff --git a/main/libs/rxandroid-0.23.0.jar b/main/libs/rxandroid-0.23.0.jar
new file mode 100644
index 0000000..63c874d
--- /dev/null
+++ b/main/libs/rxandroid-0.23.0.jar
diff --git a/main/libs/rxandroid-0.23.0.jar.properties b/main/libs/rxandroid-0.23.0.jar.properties
new file mode 100644
index 0000000..f4b1b70
--- /dev/null
+++ b/main/libs/rxandroid-0.23.0.jar.properties
@@ -0,0 +1,2 @@
+src=src/rxandroid-0.23.0-sources.jar
+doc=src/rxandroid-0.23.0-javadoc.jar
diff --git a/main/libs/rxjava-1.0.0.jar b/main/libs/rxjava-1.0.0.jar
new file mode 100644
index 0000000..a5df433
--- /dev/null
+++ b/main/libs/rxjava-1.0.0.jar
diff --git a/main/libs/rxjava-1.0.0.jar.properties b/main/libs/rxjava-1.0.0.jar.properties
new file mode 100644
index 0000000..85c86a9
--- /dev/null
+++ b/main/libs/rxjava-1.0.0.jar.properties
@@ -0,0 +1,2 @@
+src=src/rxjava-1.0.0-sources.jar
+doc=src/rxjava-1.0.0-javadoc.jar
diff --git a/main/libs/rxjava-android-0.20.7.jar b/main/libs/rxjava-android-0.20.7.jar
deleted file mode 100644
index 6fd080f..0000000
--- a/main/libs/rxjava-android-0.20.7.jar
+++ /dev/null
diff --git a/main/libs/rxjava-android-0.20.7.jar.properties b/main/libs/rxjava-android-0.20.7.jar.properties
deleted file mode 100644
index 8dfaf28..0000000
--- a/main/libs/rxjava-android-0.20.7.jar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-src=src/rxjava-android-0.20.7-sources.jar
-doc=src/rxjava-android-0.20.7-javadoc.jar
diff --git a/main/libs/rxjava-async-util-0.20.7.jar.properties b/main/libs/rxjava-async-util-0.20.7.jar.properties
deleted file mode 100644
index 0fe8269..0000000
--- a/main/libs/rxjava-async-util-0.20.7.jar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-src=src/rxjava-async-util-0.20.7-sources.jar
-doc=src/rxjava-async-util-0.20.7-javadoc.jar
diff --git a/main/libs/rxjava-async-util-0.20.7.jar b/main/libs/rxjava-async-util-0.21.0.jar
index 7bb8f96..9b57574 100644
--- a/main/libs/rxjava-async-util-0.20.7.jar
+++ b/main/libs/rxjava-async-util-0.21.0.jar
diff --git a/main/libs/rxjava-async-util-0.21.0.jar.properties b/main/libs/rxjava-async-util-0.21.0.jar.properties
new file mode 100644
index 0000000..5a9fc9e
--- /dev/null
+++ b/main/libs/rxjava-async-util-0.21.0.jar.properties
@@ -0,0 +1,2 @@
+src=src/rxjava-async-util-0.21.0-sources.jar
+doc=src/rxjava-async-util-0.21.0-javadoc.jar
diff --git a/main/libs/rxjava-core-0.20.7.jar b/main/libs/rxjava-core-0.20.7.jar
deleted file mode 100644
index 390aab3..0000000
--- a/main/libs/rxjava-core-0.20.7.jar
+++ /dev/null
diff --git a/main/libs/rxjava-core-0.20.7.jar.properties b/main/libs/rxjava-core-0.20.7.jar.properties
deleted file mode 100644
index 4308ab6..0000000
--- a/main/libs/rxjava-core-0.20.7.jar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-src=src/rxjava-core-0.20.7-sources.jar
-doc=src/rxjava-core-0.20.7-javadoc.jar
diff --git a/main/libs/src/rxandroid-0.23.0-javadoc.jar b/main/libs/src/rxandroid-0.23.0-javadoc.jar
new file mode 100644
index 0000000..1c6a02f
--- /dev/null
+++ b/main/libs/src/rxandroid-0.23.0-javadoc.jar
diff --git a/main/libs/src/rxandroid-0.23.0-sources.jar b/main/libs/src/rxandroid-0.23.0-sources.jar
new file mode 100644
index 0000000..ab5d74e
--- /dev/null
+++ b/main/libs/src/rxandroid-0.23.0-sources.jar
diff --git a/main/libs/src/rxjava-1.0.0-javadoc.jar b/main/libs/src/rxjava-1.0.0-javadoc.jar
new file mode 100644
index 0000000..a6bef4e
--- /dev/null
+++ b/main/libs/src/rxjava-1.0.0-javadoc.jar
diff --git a/main/libs/src/rxjava-1.0.0-sources.jar b/main/libs/src/rxjava-1.0.0-sources.jar
new file mode 100644
index 0000000..ec367a2
--- /dev/null
+++ b/main/libs/src/rxjava-1.0.0-sources.jar
diff --git a/main/libs/src/rxjava-android-0.20.7-javadoc.jar b/main/libs/src/rxjava-android-0.20.7-javadoc.jar
deleted file mode 100644
index e9cb4b4..0000000
--- a/main/libs/src/rxjava-android-0.20.7-javadoc.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-android-0.20.7-sources.jar b/main/libs/src/rxjava-android-0.20.7-sources.jar
deleted file mode 100644
index 8485397..0000000
--- a/main/libs/src/rxjava-android-0.20.7-sources.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-async-util-0.20.7-javadoc.jar b/main/libs/src/rxjava-async-util-0.20.7-javadoc.jar
deleted file mode 100644
index efef1ff..0000000
--- a/main/libs/src/rxjava-async-util-0.20.7-javadoc.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-async-util-0.20.7-sources.jar b/main/libs/src/rxjava-async-util-0.20.7-sources.jar
deleted file mode 100644
index b03cc7b..0000000
--- a/main/libs/src/rxjava-async-util-0.20.7-sources.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-async-util-0.21.0-javadoc.jar b/main/libs/src/rxjava-async-util-0.21.0-javadoc.jar
new file mode 100644
index 0000000..28b1b63
--- /dev/null
+++ b/main/libs/src/rxjava-async-util-0.21.0-javadoc.jar
diff --git a/main/libs/src/rxjava-async-util-0.21.0-sources.jar b/main/libs/src/rxjava-async-util-0.21.0-sources.jar
new file mode 100644
index 0000000..3337f37
--- /dev/null
+++ b/main/libs/src/rxjava-async-util-0.21.0-sources.jar
diff --git a/main/libs/src/rxjava-core-0.20.7-javadoc.jar b/main/libs/src/rxjava-core-0.20.7-javadoc.jar
deleted file mode 100644
index c8499bc..0000000
--- a/main/libs/src/rxjava-core-0.20.7-javadoc.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-core-0.20.7-sources.jar b/main/libs/src/rxjava-core-0.20.7-sources.jar
deleted file mode 100644
index d8c37cc..0000000
--- a/main/libs/src/rxjava-core-0.20.7-sources.jar
+++ /dev/null
diff --git a/main/project/libraries/update-libs.sh b/main/project/libraries/update-libs.sh
index 4ef484a..9d27a0b 100755
--- a/main/project/libraries/update-libs.sh
+++ b/main/project/libraries/update-libs.sh
@@ -1,7 +1,9 @@
 #! /bin/sh
 #
 
-RXJAVA=0.20.7
+RXJAVA=1.0.0
+RXANDROID=0.23.0
+RXJAVAASYNCUTIL=0.21.0
 JACKSONCORE=2.4.3
 JACKSONDATABIND=2.4.3
 JACKSONANNOTATIONS=2.4.3
@@ -30,10 +32,12 @@ fixgradle() {
   sed -i "/def $var =/s/.*/def $var = '$version'/" ../build.gradle
 }
 
-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 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
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 3ec81fa..9f2974c 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -31,6 +31,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import rx.Observable;
+import rx.android.events.OnClickEvent;
 import rx.android.observables.AndroidObservable;
 import rx.android.observables.ViewObservable;
 import rx.functions.Action1;
@@ -511,9 +512,9 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
 
                 trackableImage.setImageResource(R.drawable.image_not_loaded);
                 trackableImage.setClickable(true);
-                ViewObservable.clicks(trackableImage, false).subscribe(new Action1<View>() {
+                ViewObservable.clicks(trackableImage, false).subscribe(new Action1<OnClickEvent>() {
                     @Override
-                    public void call(final View view) {
+                    public void call(final OnClickEvent onClickEvent) {
                         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(trackable.getImage())));
                     }
                 });