Kotlin M7, minor fixes, compatibility with 0.17.0

Author: MarioAriasC

language-adaptors/rxjava-kotlin/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.6.1673'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.7.270'
     }
 }
 
@@ -13,7 +13,7 @@ apply plugin: 'osgi'
 
 dependencies {
     compile project(':rxjava-core')
-    compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.1673'
+    compile 'org.jetbrains.kotlin:kotlin-stdlib:0.7.270'
     provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
 }

language-adaptors/rxjava-kotlin/src/main/kotlin/rx/lang/kotlin/namespace.kt

@@ -21,11 +21,16 @@ import rx.Observable
 import rx.Observable.OnSubscribe
 import rx.Subscription
 import rx.Observable.OnSubscribeFunc
+import rx.Subscriber
 
 
-public fun<T> Function1<Observer<in T>, Unit>.asObservable(): Observable<T> {
-    return Observable.create(OnSubscribe<T>{ t1 ->
-        this(t1!!)
+public fun<T> Function1<Subscriber<in T>, Unit>.asObservable(): Observable<T> {
+    val v = this
+    return Observable.create(object:OnSubscribe<T> {
+        override fun call(t1: Subscriber<in T>?) {
+            v(t1!!)
+        }
+
     })!!
 }
 

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

@@ -16,10 +16,7 @@
 
 package rx.lang.kotlin
 
-import org.mockito.Mock
 import rx.Observable
-import org.junit.Before
-import org.mockito.MockitoAnnotations
 import org.junit.Test
 import rx.subscriptions.Subscriptions
 import org.mockito.Mockito.*
@@ -31,21 +28,23 @@ import rx.Subscription
 import kotlin.concurrent.thread
 import rx.Observable.OnSubscribeFunc
 import rx.lang.kotlin.BasicKotlinTests.AsyncObservable
+import rx.Observable.OnSubscribe
+import rx.Subscriber
 
 /**
  * This class use plain Kotlin without extensions from the language adaptor
  */
-public class BasicKotlinTests:KotlinTests() {
-
+public class BasicKotlinTests : KotlinTests() {
 
 
     [Test]
     public fun testCreate() {
 
-        Observable.create(OnSubscribeFunc<String> {
-            it!!.onNext("Hello")
-            it.onCompleted()
-            Subscriptions.empty()
+        Observable.create(object:OnSubscribe<String> {
+            override fun call(subscriber: Subscriber<in String>?) {
+                subscriber!!.onNext("Hello")
+                subscriber.onCompleted()
+            }
         })!!.subscribe { result ->
             a!!.received(result)
         }
@@ -310,7 +309,7 @@ public class BasicKotlinTests:KotlinTests() {
 
 
 
-    public class TestFactory(){
+    public class TestFactory() {
         var counter = 1
 
         val numbers: Observable<Int>
@@ -330,7 +329,7 @@ public class BasicKotlinTests:KotlinTests() {
 
     }
 
-    class AsyncObservable : OnSubscribeFunc<Int>{
+    class AsyncObservable : OnSubscribeFunc<Int> {
         override fun onSubscribe(op: Observer<in Int>?): Subscription? {
             thread {
                 Thread.sleep(50)
@@ -343,7 +342,7 @@ public class BasicKotlinTests:KotlinTests() {
         }
     }
 
-    class TestOnSubscribe(val count: Int) : OnSubscribeFunc<String>{
+    class TestOnSubscribe(val count: Int) : OnSubscribeFunc<String> {
         override fun onSubscribe(op: Observer<in String>?): Subscription? {
             op!!.onNext("hello_$count")
             op.onCompleted()

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

@@ -16,10 +16,7 @@
 
 package rx.lang.kotlin
 
-import org.mockito.Mock
 import rx.Observable
-import org.junit.Before
-import org.mockito.MockitoAnnotations
 import org.junit.Test
 import rx.subscriptions.Subscriptions
 import org.mockito.Mockito.*
@@ -29,6 +26,7 @@ import org.junit.Assert.*
 import rx.Notification
 import rx.Subscription
 import kotlin.concurrent.thread
+import rx.Subscriber
 
 /**
  * This class contains tests using the extension functions provided by the language adaptor.
@@ -39,11 +37,10 @@ public class ExtensionTests : KotlinTests() {
     [Test]
     public fun testCreate() {
 
-        {(observer: Observer<in String>) ->
-            observer.onNext("Hello")
-            observer.onCompleted()
-            Subscriptions.empty()!!
-        }.asObservableFunc().subscribe { result ->
+        {(subscriber: Subscriber<in String>) ->
+            subscriber.onNext("Hello")
+            subscriber.onCompleted()
+        }.asObservable().subscribe { result ->
             a!!.received(result)
         }
 
@@ -283,7 +280,7 @@ public class ExtensionTests : KotlinTests() {
         return {(p2: P2) -> this(p1, p2) }
     }
 
-    inner public class TestFactory(){
+    inner public class TestFactory() {
         var counter = 1
 
         val numbers: Observable<Int>