rxKotlin for rxJava2 (#87)

* Dependencies updated

* Initial implementation of rxKotlin for rxJava2

* Code cleaning.
Code review related fixes.

* Whitespaces removed.

* gitignore update

* subscribers replaced by named args extension

* subscribeBy non-null params

* empty* methods removed
flowable extensions added
minor fixes

* dependencies updated

* subscribeBy method for Flowable

* tests updated

* minor tests refactoring

Author: stepango

.gitignore

@@ -69,3 +69,4 @@ bin/
 # Scala build
 *.cache
 /.nb-gradle/private/
+local.properties

RELEASING.md

@@ -0,0 +1,19 @@
+Release Process
+===============
+
+ 1.  Ensure `VERSION_NAME` in `gradle.properties` is set to the version you want to release.
+ 2.  Add an entry in `CHANGELOG.md` with the changes for the release.
+ 3.  Update `README.md` with the version about to be released. Also update the RxJava version in
+     this file to its latest.
+ 4.  Update the RxJava version in `rxkotlin/build.gradle` to its latest. (We tell people that we
+     won't be tracking RxJava releases, and we don't, but we do it anyway when we are releasing for
+     those who ignore the advice.)
+ 5.  Commit: `git commit -am "Prepare version X.Y.X"`
+ 6.  Tag: `git tag -a X.Y.Z -m "Version X.Y.Z"`
+ 7.  Update `VERSION_NAME` in `gradle.properties` to the next development version. For example, if
+     you just tagged version 1.0.4 you would set this value to 1.0.5. Do NOT append "-SNAPSHOT" to
+     this value, it will be added automatically.
+ 8.  Commit: `git commit -am "Prepare next development version."`
+ 9.  Push: `git push && git push --tags`
+ 10. Paste the `CHANGELOG.md` contents for this version into a Release on GitHub along with the
+     Groovy for depending on the new version (https://github.com/ReactiveX/RxKotlin/releases).

build.gradle

@@ -1,24 +1,26 @@
 buildscript {
-  ext.kotlin_version = '1.0.2'
-  repositories { jcenter() }
-  dependencies { classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:2.+',
-                           "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" }
+    ext.kotlin_version = '1.0.6'
+    repositories { jcenter() }
+    dependencies {
+        classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:4.+',
+                "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
 }
 
-apply plugin: 'rxjava-project'
+apply plugin: 'nebula.rxjava-project'
 apply plugin: 'kotlin'
 
 dependencies {
-    compile 'io.reactivex:rxjava:1.1.5'
+    compile 'io.reactivex.rxjava2:rxjava:2.0.5'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile 'org.funktionale:funktionale:0.8'
+    testCompile 'org.funktionale:funktionale:0.9'
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.8.5'
+    testCompile 'org.mockito:mockito-core:1.10.19'
     examplesCompile 'com.squareup.retrofit:retrofit:1.9.+'
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.2.1'
+    gradleVersion = '2.14'
 }
 
 // support for snapshot/final releases with the various branches RxJava uses

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Sat Mar 07 02:11:57 MSK 2015
+#Sun Feb 12 16:33:43 SGT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,17 +1,35 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

gradlew.bat

@@ -1,21 +1,28 @@
 package rx.lang.kotlin.examples
 
-import rx.Observable
-import rx.lang.kotlin.*
-import rx.subscriptions.CompositeSubscription
+import io.reactivex.Observable
+import io.reactivex.disposables.CompositeDisposable
+import rx.lang.kotlin.addTo
+import rx.lang.kotlin.combineLatest
+import rx.lang.kotlin.observable
+import rx.lang.kotlin.plusAssign
+import rx.lang.kotlin.subscribeBy
+import rx.lang.kotlin.toObservable
+import rx.lang.kotlin.zip
 import java.net.URL
-import java.util.*
+import java.util.Scanner
 import java.util.concurrent.TimeUnit
 import kotlin.concurrent.thread
 
 fun main(args: Array<String>) {
 
-    val subscription = CompositeSubscription()
+    val subscription = CompositeDisposable()
 
     val printArticle = { art: String ->
         println("--- Article ---\n${art.substring(0, 125)}")
     }
 
+    @Suppress("ConvertLambdaToReference")
     val printIt = { it: String -> println(it) }
 
     subscription += asyncObservable().subscribe(printIt)
@@ -36,80 +43,80 @@ fun main(args: Array<String>) {
 
     zip(listOfObservables())
 
-    simpleObservable().subscribe(FunctionSubscriber<String>()
-            .onNext { s -> println("1st onNext => $s") }
-            .onNext { s -> println("2nd onNext => $s") })
+    simpleObservable().subscribeBy(
+            onNext = { s: String -> println("1st onNext => $s") } andThen { println("2nd onNext => $it") }
+    )
 
     addToCompositeSubscription()
 }
 
 private fun URL.toScannerObservable() = observable<String> { s ->
     this.openStream().use { stream ->
-        Scanner(stream).useDelimiter("\\A").toObservable().subscribe(s)
+        Scanner(stream).useDelimiter("\\A")
+                .toObservable()
+                .subscribe { s.onNext(it) }
     }
 }
 
-fun syncObservable(): Observable<String> =
-    observable { subscriber ->
-        (0..75).toObservable()
-                .map { "Sync value_$it" }
-                .subscribe(subscriber)
-    }
+fun syncObservable(): Observable<String> = observable { subscriber ->
+    (0..75).toObservable()
+            .map { "Sync value_$it" }
+            .subscribe { subscriber.onNext(it) }
+}
 
-fun asyncObservable(): Observable<String> =
-    observable { subscriber ->
-        thread {
-            (0..75).toObservable()
-                    .map { "Async value_$it" }
-                    .subscribe(subscriber)
-        }
+fun asyncObservable(): Observable<String> = observable { subscriber ->
+    thread {
+        (0..75).toObservable()
+                .map { "Async value_$it" }
+                .subscribe { subscriber.onNext(it) }
     }
+}
 
-fun asyncWiki(vararg articleNames: String): Observable<String> =
-    observable { subscriber ->
-        thread {
-            articleNames.toObservable()
-                    .flatMap { name -> URL("http://en.wikipedia.org/wiki/$name").toScannerObservable().first() }
-                    .subscribe(subscriber)
-        }
+fun asyncWiki(vararg articleNames: String): Observable<String> = observable { subscriber ->
+    thread {
+        articleNames.toObservable()
+                .flatMapMaybe { name -> URL("http://en.wikipedia.org/wiki/$name").toScannerObservable().firstElement() }
+                .subscribe { subscriber.onNext(it) }
     }
+}
 
-fun asyncWikiWithErrorHandling(vararg articleNames: String): Observable<String> =
-    observable { subscriber ->
-        thread {
-            articleNames.toObservable()
-                    .flatMap { name -> URL("http://en.wikipedia.org/wiki/$name").toScannerObservable().first() }
-                    .onError { e ->
-                        subscriber.onError(e) }
-                    .subscribe(subscriber)
-        }
+fun asyncWikiWithErrorHandling(vararg articleNames: String): Observable<String> = observable { subscriber ->
+    thread {
+        articleNames.toObservable()
+                .flatMapMaybe { name -> URL("http://en.wikipedia.org/wiki/$name").toScannerObservable().firstElement() }
+                .subscribe({ subscriber.onNext(it) }, { subscriber.onError(it) })
     }
+}
 
 fun simpleComposition() {
-    asyncObservable().skip(10).take(5)
-            .map { s -> "${s}_xform" }
-            .subscribe { s -> println("onNext => $s") }
+    asyncObservable()
+            .skip(10)
+            .take(5)
+            .map { "${it}_xform" }
+            .subscribe { println("onNext => $it") }
 }
 
 fun listOfObservables(): List<Observable<String>> = listOf(syncObservable(), syncObservable())
 
 fun combineLatest(observables: List<Observable<String>>) {
-    observables.combineLatest { it.reduce { one, two -> one + two } }.subscribe { println(it) }
+    observables.combineLatest { it.reduce { one, two -> one + two } }.subscribe(::println)
 }
 
 fun zip(observables: List<Observable<String>>) {
-    observables.zip { it.reduce { one, two -> one + two } }.subscribe { println(it) }
+    observables.zip { it.reduce { one, two -> one + two } }.subscribe(::println)
 }
 
 fun simpleObservable(): Observable<String> = (0..17).toObservable().map { "Simple $it" }
 
 fun addToCompositeSubscription() {
-    val compositeSubscription = CompositeSubscription()
+    val compositeSubscription = CompositeDisposable()
 
     Observable.just("test")
             .delay(100, TimeUnit.MILLISECONDS)
             .subscribe()
             .addTo(compositeSubscription)
 
-    compositeSubscription.unsubscribe()
-}
+    compositeSubscription.dispose()
+}
+
+infix inline fun <T : Any> ((T) -> Unit).andThen(crossinline block: (T) -> Unit): (T) -> Unit = { this(it); block(it) }