Skip to content

Commit

Permalink
[59] Add cross build for Scala 2.13
Browse files Browse the repository at this point in the history
  • Loading branch information
dragisak committed Dec 27, 2019
1 parent 973514e commit f12c2ee
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 20 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
target/**
.idea/**
project/target/**
project/project/**
target
.idea
.bloop
.metals
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 10 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -43,7 +45,9 @@ publishMavenStyle := true

publishArtifact in Test := false

pomIncludeRepository := { _ => false }
pomIncludeRepository := { _ =>
false
}

pomExtra :=
<url>https://www.madewithtea.com/pages/mocked-streams.html</url>
Expand All @@ -62,7 +66,6 @@ pomExtra :=
</developer>
</developers>


micrositeName := "Mocked Streams"
micrositeDescription := "Unit-Testing Topologies in Kafka Streams"
micrositeUrl := "http://mockedstreams.madewithtea.com"
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.3.6
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit f12c2ee

Please sign in to comment.