undo commit 99a1d03

Author: samuelgruetter

gradlew

@@ -12,8 +12,6 @@ DEFAULT_JVM_OPTS=""
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
-JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk1.7.0_40.jdk/Contents/Home"
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/subjects/SubjectTests.scala

@@ -3,9 +3,8 @@ package rx.lang.scala.subscriptions
 import org.junit.Assert._
 import org.junit.Test
 import org.scalatest.junit.JUnitSuite
-import rx.lang.scala._
-
 
+import rx.lang.scala.Subscription
 
 class SubscriptionTests extends JUnitSuite {
 
@@ -47,7 +46,7 @@ class SubscriptionTests extends JUnitSuite {
     val s0 = BooleanSubscription{ u0 = true }
 
     var u1 = false
-    val s1 = rx.lang.scala.Subscription{ u1 = true }
+    val s1 = Subscription{ u1 = true }
 
     val composite = CompositeSubscription()