diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 5892592..1e2ec89 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,5 +1,6 @@ # Contributors +* Ivan Orone * Hamidreza Afzali * Jendrik Poloczek * Svend Vanderveken diff --git a/build.sbt b/build.sbt index 0e1f966..3161d60 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,14 @@ lazy val commonSettings = Seq( organization := "com.madewithtea", +<<<<<<< HEAD version := "3.6.0", scalaVersion := "2.13.1", crossScalaVersions := List("2.12.10", "2.13.1"), +======= + version := "3.5.2", + scalaVersion := "2.13.1", + crossScalaVersions := List("2.12.11", "2.13.1"), +>>>>>>> master description := "Topology Unit-Testing Library for Kafka Streams", organizationHomepage := Some(url("https://www.madewithtea.com")), scalacOptions := Seq("-deprecation","-feature") diff --git a/docs/index.md b/docs/index.md index 8e8672b..cb274f1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -61,6 +61,8 @@ Please use the corresponding Mocked Streams version to a concrete Apache Kafka v ## Companies using Mocked Streams +* [BlaBlaCar](https://medium.com/blablacar-tech) +* [PMU.fr](https://www.pmu.fr/) * [Sky.uk](https://www.sky.com/) -* [moip, a wirecard company](https://moip.com.br/en/) * [Hive Streaming AB](https://www.hivestreaming.com/) +* [moip, a wirecard company](https://moip.com.br/en/) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7ff9d26..e8bd468 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0") -addSbtPlugin("com.47deg" % "sbt-microsites" % "1.0.1") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.0.2") +addSbtPlugin("com.47deg" % "sbt-microsites" % "1.1.5") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5") diff --git a/src/main/scala/com/madewithtea/mockedstreams/MockedStreams.scala b/src/main/scala/com/madewithtea/mockedstreams/MockedStreams.scala index 33d493e..b2705c1 100644 --- a/src/main/scala/com/madewithtea/mockedstreams/MockedStreams.scala +++ b/src/main/scala/com/madewithtea/mockedstreams/MockedStreams.scala @@ -41,7 +41,6 @@ object MockedStreams { sealed trait Input case class Record(consumerRecord: ConsumerRecord[Array[Byte], Array[Byte]]) extends Input - case class WallClock(duration: Long) extends Input implicit def recordsInstant[K, V](list: Seq[(K, V, Instant)]) = RecordsInstant(list)