diff --git a/.gitignore b/.gitignore index 7bc8b82..8f9609c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -target/** -.idea/** -project/target/** -project/project/** +target +.idea +.bloop +.metals diff --git a/.travis.yml b/.travis.yml index 56f3090..03f3b29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,10 @@ language: scala -scala: - - 2.12.8 jdk: - - openjdk11 + - openjdk11 script: - - sbt clean coverage test coverageReport + - sbt clean coverage +test coverageReport after_success: - bash <(curl -s https://codecov.io/bash) -t "4b854b7d-2c0e-42b8-80dd-4d2bd4a60535" diff --git a/build.sbt b/build.sbt index 10b1dea..7e228b4 100644 --- a/build.sbt +++ b/build.sbt @@ -2,9 +2,11 @@ lazy val commonSettings = Seq( organization := "com.madewithtea", version := "3.5.0", scalaVersion := "2.12.10", + crossScalaVersions := List("2.12.10", "2.13.1"), description := "Topology Unit-Testing Library for Kafka Streams", organizationHomepage := Some(url("https://www.madewithtea.com")), - scalacOptions := Seq("-Xexperimental")) + scalacOptions := Seq("-Xexperimental") +) val scalaTestVersion = "3.0.8" val rocksDBVersion = "5.18.3" @@ -22,9 +24,9 @@ lazy val kafka = Seq( lazy val scalaTest = "org.scalatest" %% "scalatest" % scalaTestVersion % "test" lazy val rocksDB = "org.rocksdb" % "rocksdbjni" % rocksDBVersion % "test" -lazy val mockedstreams = (project in file(".")). - settings(commonSettings: _*). - settings( +lazy val mockedstreams = (project in file(".")) + .settings(commonSettings: _*) + .settings( libraryDependencies ++= Seq( scalaTest, rocksDB @@ -43,7 +45,9 @@ publishMavenStyle := true publishArtifact in Test := false -pomIncludeRepository := { _ => false } +pomIncludeRepository := { _ => + false +} pomExtra := https://www.madewithtea.com/pages/mocked-streams.html @@ -62,7 +66,6 @@ pomExtra := - micrositeName := "Mocked Streams" micrositeDescription := "Unit-Testing Topologies in Kafka Streams" micrositeUrl := "http://mockedstreams.madewithtea.com" @@ -78,7 +81,7 @@ micrositeTwitterCreator := "@madewithtea" micrositeCompilingDocsTool := WithMdoc micrositeShareOnSocial := true -lazy val docs = project // new documentation project +lazy val docs = project // new documentation project .in(file("ms-docs")) // important: it must not be docs/ .dependsOn(mockedstreams) .enablePlugins(MdocPlugin) diff --git a/project/build.properties b/project/build.properties index c0bab04..00b48d9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index dc1784d..7150ba2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0") -addSbtPlugin("com.47deg" % "sbt-microsites" % "0.9.2") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.0.2" ) +addSbtPlugin("com.47deg" % "sbt-microsites" % "1.0.1") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.0.2")