fix deprecation warnings from pr #7

Author: dylemma

build.sbt

@@ -0,0 +1,51 @@
+name := "scala-frp"
+
+organization := "io.dylemma"
+
+version := "1.3"
+
+crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0")
+
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.0" % "test"
+
+scalacOptions in Compile += "-deprecation"
+
+scalacOptions in (Compile, doc) += "-implicits"
+
+// publishing stuff below
+
+publishMavenStyle := true
+
+publishTo := {
+	val nexus = "https://oss.sonatype.org/"
+	if(isSnapshot.value)
+		Some("snapshots" at nexus + "content/repositories/snapshots")
+	else
+		Some("releases" at nexus + "service/local/staging/deploy/maven2")
+}
+
+publishArtifact in Test := false
+
+pomIncludeRepository := { _ => false }
+
+pomExtra := (
+<url>https://github.com/dylemma/scala.frp</url>
+	<licenses>
+		<license>
+			<name>MIT License</name>
+			<url>http://opensource.org/licenses/mit-license.php</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<url>git@github.com:dylemma/scala.frp.git</url>
+		<connection>scm:git:git@github.com:dylemma/scala.frp.git</connection>
+	</scm>
+	<developers>
+		<developer>
+			<id>dylemma</id>
+			<name>Dylan Halperin</name>
+			<url>http://dylemma.io/</url>
+		</developer>
+	</developers>
+)

project/Build.scala

@@ -303,14 +303,13 @@ private[frp] class ZipWithStalenessEventStream[A](val parent: EventStream[A]) ex
 
 private[frp] class ZippedEventStream[A, B](val leftParent: EventStream[A], val rightParent: EventStream[B])
 	extends EventJoin[A, B, (A, B)] {
-	import scala.collection.JavaConversions._
-	
+
 	private val leftQueue = new java.util.concurrent.ConcurrentLinkedQueue[A]
 	private val rightQueue = new java.util.concurrent.ConcurrentLinkedQueue[B]
 
 	//if there are elements available from both queues, dequeue them and fire the pair
 	private def tryDequeue() = {
-		if (leftQueue.nonEmpty && rightQueue.nonEmpty) {
+		if (!leftQueue.isEmpty && !rightQueue.isEmpty) {
 			val l = leftQueue.remove()
 			val r = rightQueue.remove()
 			fire(l -> r)

src/main/scala/io/dylemma/frp/impl/EventStreamCombinators.scala

@@ -1,11 +1,12 @@
 package io.dylemma.frp.test
 
-import org.scalatest._
-import org.scalatest.concurrent.AsyncAssertions
 import io.dylemma.frp._
+import org.scalatest._
+import org.scalatest.concurrent.Waiters
+
 import scala.concurrent.duration._
 
-class EventStreamDeadlineTests extends FunSuite with TestHelpers with AsyncAssertions with Observer {
+class EventStreamDeadlineTests extends FunSuite with TestHelpers with Waiters with Observer {
 
 	test("EventStream.before only encounters events before the deadline") {
 		val w = new Waiter

src/test/scala/io/dylemma/frp/test/EventStreamDeadlineTests.scala

@@ -1,20 +1,20 @@
 package io.dylemma.frp.test
 
-import org.scalatest._
-import org.scalatest.concurrent.AsyncAssertions
-import org.scalatest.time.SpanSugar._
 import io.dylemma.frp._
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.util._
+import org.scalatest._
+import org.scalatest.concurrent.Waiters
 import org.scalatest.exceptions.TestFailedException
 
-class EventStreamFuturesTest extends FunSuite with TestHelpers with AsyncAssertions with Observer {
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.util.{Failure, Success}
+
+class EventStreamFuturesTest extends FunSuite with TestHelpers with Waiters with Observer {
 
 	test("EventStream.next completes successfully when the stream fires an event") {
 		val w = new Waiter
 		val s = EventSource[Int]()
 
-		s.next onSuccess { case 5 => w.dismiss }
+		s.next foreach { case 5 => w.dismiss }
 		s fire 5
 		w.await(dismissals(1))
 	}
@@ -24,15 +24,21 @@ class EventStreamFuturesTest extends FunSuite with TestHelpers with AsyncAsserti
 		val s = EventSource[Int]()
 
 		s.stop() // stream stopped before `next` is called
-		s.next onFailure { case _ => w.dismiss }
+		s.next onComplete {
+			case Failure(_) => w.dismiss
+			case Success(_) =>
+		}
 		w.await(dismissals(1))
 	}
 
 	test("EventStream.next completes with a failure if the stream stops before firing an event") {
 		val w = new Waiter
 		val s = EventSource[Int]()
 
-		s.next onFailure { case _ => w.dismiss }
+		s.next onComplete {
+			case Failure(_) => w.dismiss
+			case Success(_) =>
+		}
 		s.stop() // stream stopped after `next` is called
 		w.await(dismissals(1))
 	}
@@ -58,7 +64,7 @@ class EventStreamFuturesTest extends FunSuite with TestHelpers with AsyncAsserti
 		val w = new Waiter
 		val s = EventSource[Int]()
 
-		s.last onSuccess { case 3 => w.dismiss }
+		s.last foreach { case 3 => w.dismiss }
 		s fire 1
 		s fire 2
 		s fire 3
@@ -71,7 +77,7 @@ class EventStreamFuturesTest extends FunSuite with TestHelpers with AsyncAsserti
 		val w = new Waiter
 		val s = EventSource[Int]()
 
-		s.last onSuccess { case 3 => w.dismiss }
+		s.last foreach { case 3 => w.dismiss }
 		s fire 1
 		s fire 2
 		s fire 3
@@ -87,15 +93,21 @@ class EventStreamFuturesTest extends FunSuite with TestHelpers with AsyncAsserti
 		val s = EventSource[Int]()
 		s.stop()
 
-		s.last onFailure { case _ => w.dismiss }
+		s.last onComplete {
+			case Failure(_) => w.dismiss
+			case Success(_) =>
+		}
 		w.await(dismissals(1))
 	}
 
 	test("EventStream.last should be a failure if the stream stops before firing an event") {
 		val w = new Waiter
 		val s = EventSource[Int]()
 
-		s.last onFailure { case _ => w.dismiss }
+		s.last onComplete {
+			case Failure(_) => w.dismiss
+			case Success(_) =>
+		}
 		s.stop()
 		w.await(dismissals(1))
 	}
@@ -105,15 +117,15 @@ class EventStreamFuturesTest extends FunSuite with TestHelpers with AsyncAsserti
 		val s = EventSource[Int]()
 		s.stop()
 
-		s.end onSuccess { case _ => w.dismiss }
+		s.end foreach { case _ => w.dismiss }
 		w.await(dismissals(1))
 	}
 
 	test("EventStream.end completes successfully when the stream stops") {
 		val w = new Waiter
 		val s = EventSource[Int]()
 
-		s.end onSuccess { case _ => w.dismiss }
+		s.end foreach { case _ => w.dismiss }
 		s.stop()
 		w.await(dismissals(1))
 	}