Fixed implicit conversions to make compile work

Author: AppliedDuality

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/ImplicitFunctionConversions.scala

@@ -33,10 +33,17 @@ import scala.language.implicitConversions
 object ImplicitFunctionConversions {
   import language.implicitConversions
 
-  implicit def schedulerActionToFunc2[T](action: (Scheduler, T) => Subscription): Func2[rx.Scheduler, T, rx.Subscription] with Object {def call(s: rx.Scheduler, t: T): rx.Subscription} =
+//  implicit def schedulerActionToFunc2[T](action: (Scheduler, T) => Subscription): Func2[rx.Scheduler, T, rx.Subscription] with Object {def call(s: rx.Scheduler, t: T): rx.Subscription} =
+//    new Func2[rx.Scheduler, T, rx.Subscription] {
+//      def call(s: rx.Scheduler, t: T): rx.Subscription = {
+//        action(rx.lang.scala.Scheduler(s), t).asJavaSubscription
+//      }
+//    }
+
+  implicit def schedulerActionToFunc2[T](action: (Scheduler, T) => Subscription) =
     new Func2[rx.Scheduler, T, rx.Subscription] {
       def call(s: rx.Scheduler, t: T): rx.Subscription = {
-        action(rx.lang.scala.Scheduler(s), t).asJavaSubscription
+        action(Scheduler(s), t).asJavaSubscription
       }
     }
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Scheduler.scala

@@ -23,6 +23,8 @@ import rx.util.functions.{Action0, Action1, Func2}
  * Represents an object that schedules units of work.
  */
 trait Scheduler {
+  import rx.lang.scala.ImplicitFunctionConversions._
+
   val asJavaScheduler: rx.Scheduler
 
   /**
@@ -73,7 +75,8 @@ trait Scheduler {
    * @return a subscription to be able to unsubscribe from action.
    */
   private def schedule[T](state: T, action: (Scheduler, T) => Subscription, delayTime: Duration): Subscription = {
-    Subscription(asJavaScheduler.schedule(state, action, delayTime.length, delayTime.unit))
+    val xxx = schedulerActionToFunc2(action)
+    Subscription(asJavaScheduler.schedule(state, xxx, delayTime.length, delayTime.unit))
   }
 
   /**

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Subscription.scala

@@ -52,7 +52,7 @@ object Subscription {
       case x: rx.subscriptions.CompositeSubscription => new CompositeSubscription(x)
       case x: rx.subscriptions.MultipleAssignmentSubscription => new MultipleAssignmentSubscription(x)
       case x: rx.subscriptions.SerialSubscription => new SerialSubscription(x)
-      case x: rx.Subscription => Subscription { x.unsubscribe() }
+      case x: rx.Subscription => apply { x.unsubscribe() }
     }
   }
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/subjects/BehaviorSubject.scala

@@ -19,7 +19,7 @@ import rx.lang.scala.Subject
 
 object BehaviorSubject {
   def apply[T](value: T): BehaviorSubject[T] = {
-    new BehaviorSubject[T](rx.subjects.BehaviorSubject.createWithDefaultValue(value))
+    new BehaviorSubject[T](rx.subjects.BehaviorSubject.create(value))
   }
 }
 

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/subscriptions/SubscriptionTests.scala

@@ -4,8 +4,6 @@ import org.junit.Assert._
 import org.junit.Test
 import org.scalatest.junit.JUnitSuite
 
-import rx.lang.scala.Subscription
-
 class SubscriptionTests extends JUnitSuite {
 
   @Test