Skip to content

Commit

Permalink
rebased to master
Browse files Browse the repository at this point in the history
  • Loading branch information
jpzk committed Apr 6, 2020
2 parents bf50d48 + fc99518 commit a81dd2a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 4 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Contributors

* Ivan Orone
* Hamidreza Afzali
* Jendrik Poloczek
* Svend Vanderveken
Expand Down
6 changes: 6 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 3 additions & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a81dd2a

Please sign in to comment.