Skip to content

Commit aad4be7

Browse files
committed
Updated to Scala 2.12.3 and sbt 1.0.1
`
1 parent 868449d commit aad4be7

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ val slf4jLog4jArtifact = "slf4j-log4j12"
1111

1212
lazy val commonSettings = Seq(
1313
organization := "net.manub",
14-
scalaVersion := "2.12.1",
15-
crossScalaVersions := Seq("2.12.1", "2.11.8"),
14+
scalaVersion := "2.12.3",
15+
crossScalaVersions := Seq("2.12.3", "2.11.11"),
1616
homepage := Some(url("https://github.com/manub/scalatest-embedded-kafka")),
1717
parallelExecution in Test := false,
1818
logBuffered in Test := false,

embedded-kafka/src/test/scala/net/manub/embeddedkafka/embeddedKafkaSpecSupport.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import org.scalatest.concurrent.{
1515
import org.scalatest.time.{Milliseconds, Seconds, Span}
1616
import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpecLike}
1717

18+
import scala.concurrent.Await
1819
import scala.concurrent.duration._
1920
import scala.language.postfixOps
2021

@@ -33,14 +34,13 @@ abstract class EmbeddedKafkaSpecSupport
3334
PatienceConfig(Span(2, Seconds), Span(100, Milliseconds))
3435

3536
override def afterAll(): Unit = {
36-
system.shutdown()
37+
Await.result(system.terminate(), 5.seconds)
3738
super.afterAll()
3839
}
3940

4041
def kafkaIsAvailable(kafkaPort: Int = 6001): Unit = {
4142
system.actorOf(
42-
TcpClient.props(new InetSocketAddress("localhost", kafkaPort),
43-
testActor))
43+
TcpClient.props(new InetSocketAddress("localhost", kafkaPort), testActor))
4444
expectMsg(1 second, ConnectionSuccessful)
4545
}
4646

@@ -59,14 +59,15 @@ abstract class EmbeddedKafkaSpecSupport
5959

6060
def zookeeperIsNotAvailable(zookeeperPort: Int = 6000): Unit = {
6161
system.actorOf(
62-
TcpClient.props(new InetSocketAddress("localhost", zookeeperPort), testActor))
62+
TcpClient.props(new InetSocketAddress("localhost", zookeeperPort),
63+
testActor))
6364
expectMsg(1 second, ConnectionFailed)
6465
}
6566
}
6667

6768
object TcpClient {
6869
def props(remote: InetSocketAddress, replies: ActorRef) =
69-
Props(classOf[TcpClient], remote, replies)
70+
Props(new TcpClient(remote, replies))
7071
}
7172

7273
case object ConnectionSuccessful

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=1.0.1

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
1+
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
22

3-
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.4")
3+
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
44

5-
addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.5.6")
5+
addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.2.0")

0 commit comments

Comments
 (0)