Merge pull request #845 from MarioAriasC/master

Fix problem with Subscription

Author: benjchristensen

language-adaptors/rxjava-kotlin/src/test/kotlin/rx/lang/kotlin/BasicKotlinTests.kt

@@ -347,7 +347,7 @@ public class BasicKotlinTests:KotlinTests() {
         override fun onSubscribe(op: Observer<in String>?): Subscription? {
             op!!.onNext("hello_$count")
             op.onCompleted()
-            return Subscription { }
+            return Subscriptions.empty()!!
         }
 
     }

language-adaptors/rxjava-kotlin/src/test/kotlin/rx/lang/kotlin/ExtensionTests.kt

@@ -33,7 +33,7 @@ import kotlin.concurrent.thread
 /**
  * This class contains tests using the extension functions provided by the language adaptor.
  */
-public class ExtensionTests:KotlinTests() {
+public class ExtensionTests : KotlinTests() {
 
 
     [Test]
@@ -262,7 +262,7 @@ public class ExtensionTests:KotlinTests() {
     val funOnSubscribe: (Int, Observer<in String>) -> Subscription = { counter, observer ->
         observer.onNext("hello_$counter")
         observer.onCompleted()
-        Subscription { }
+        Subscriptions.empty()!!
     }
 
     val asyncObservable: (Observer<in Int>) -> Subscription = { observer ->

settings.gradle

@@ -4,7 +4,7 @@ include 'rxjava-core', \
 'language-adaptors:rxjava-clojure', \
 'language-adaptors:rxjava-jruby', \
 'language-adaptors:rxjava-scala', \
-//'language-adaptors:rxjava-kotlin', \
+'language-adaptors:rxjava-kotlin', \
 'rxjava-contrib:rxjava-swing', \
 'rxjava-contrib:rxjava-android', \
 'rxjava-contrib:rxjava-apache-http', \