diff --git a/README.md b/README.md index 009b8c0..9c09233 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ docker-it-scala ============= +[![CI](https://github.com/whisklabs/docker-it-scala/actions/workflows/ci.yaml/badge.svg)](https://github.com/whisklabs/docker-it-scala/actions/workflows/ci.yaml) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.whisk/docker-testkit-core_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.whisk/docker-testkit-core_2.12) [![Join the chat at https://gitter.im/whisklabs/docker-it-scala](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/whisklabs/docker-it-scala?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) @@ -22,16 +23,16 @@ There are separate artifacts available for these libraries: ```scala libraryDependencies ++= Seq( - "com.whisk" %% "docker-testkit-scalatest" % "0.9.9" % "test", - "com.whisk" %% "docker-testkit-impl-spotify" % "0.9.9" % "test") + "com.whisk" %% "docker-testkit-scalatest" % "0.11.0" % "test", + "com.whisk" %% "docker-testkit-impl-spotify" % "0.11.0" % "test") ``` **docker-java** ```scala libraryDependencies ++= Seq( - "com.whisk" %% "docker-testkit-scalatest" % "0.9.9" % "test", - "com.whisk" %% "docker-testkit-impl-docker-java" % "0.9.9" % "test") + "com.whisk" %% "docker-testkit-scalatest" % "0.11.0" % "test", + "com.whisk" %% "docker-testkit-impl-docker-java" % "0.11.0" % "test") ``` You don't necessarily have to use `scalatest` dependency as demonstrated above. diff --git a/build.sbt b/build.sbt index 725b7c8..5650d0b 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,8 @@ lazy val commonSettings = Seq( organization := "com.whisk", - version := "0.10.0-RC", + version := "0.11.0", scalaVersion := "2.13.6", - crossScalaVersions := Seq("2.13.6", "2.12.15", "2.11.12"), + crossScalaVersions := Seq("2.13.6", "2.12.15", "2.11.12", "3.0.2"), scalacOptions ++= Seq("-feature", "-deprecation"), Test / fork := true, licenses += ("MIT", url("http://opensource.org/licenses/MIT")), @@ -56,7 +56,7 @@ lazy val scalatest = .settings( name := "docker-testkit-scalatest", libraryDependencies ++= Seq( - "org.scalatest" %% "scalatest" % "3.1.2", + "org.scalatest" %% "scalatest" % "3.2.9", "ch.qos.logback" % "logback-classic" % "1.2.3" % "test" ) ) diff --git a/core/src/main/scala/com/whisk/docker/testkit/DockerTestTimeouts.scala b/core/src/main/scala/com/whisk/docker/testkit/DockerTestTimeouts.scala index 85f641d..1d3b1af 100644 --- a/core/src/main/scala/com/whisk/docker/testkit/DockerTestTimeouts.scala +++ b/core/src/main/scala/com/whisk/docker/testkit/DockerTestTimeouts.scala @@ -10,5 +10,5 @@ case class DockerTestTimeouts( object DockerTestTimeouts { - val Default = DockerTestTimeouts() + val Default: DockerTestTimeouts = DockerTestTimeouts() } diff --git a/notes/0.11.0.markdown b/notes/0.11.0.markdown new file mode 100644 index 0000000..0fabdc4 --- /dev/null +++ b/notes/0.11.0.markdown @@ -0,0 +1,9 @@ +#scala #docker #integration-testing + +## Highlights + +* add cross-compilation for scala [3](https://github.com/whisklabs/docker-it-scala/pull/146) +* proper [timeouts handling](https://github.com/whisklabs/docker-it-scala/pull/133) +* updated [sbt with plugins](https://github.com/whisklabs/docker-it-scala/pull/147) +* create Github Action [CI](https://github.com/whisklabs/docker-it-scala/pull/147) +* docs and small code improvements diff --git a/tests/src/test/scala/com/whisk/docker/testkit/test/MultiContainerTest.scala b/tests/src/test/scala/com/whisk/docker/testkit/test/MultiContainerTest.scala index 4d4af1d..9ade0dd 100644 --- a/tests/src/test/scala/com/whisk/docker/testkit/test/MultiContainerTest.scala +++ b/tests/src/test/scala/com/whisk/docker/testkit/test/MultiContainerTest.scala @@ -8,11 +8,14 @@ class MultiContainerTest with DockerElasticsearchService with DockerMongodbService { - override val managedContainers = ContainerGroup.of(elasticsearchContainer, mongodbContainer) + override val managedContainers: ContainerGroup = + ContainerGroup.of(elasticsearchContainer, mongodbContainer) test("both containers should be ready") { - assert(elasticsearchContainer.state().isInstanceOf[ContainerState.Ready], - "elasticsearch container is ready") + assert( + elasticsearchContainer.state().isInstanceOf[ContainerState.Ready], + "elasticsearch container is ready" + ) assert(elasticsearchContainer.mappedPortOpt(9200).nonEmpty, "elasticsearch port is exposed") assert(mongodbContainer.state().isInstanceOf[ContainerState.Ready], "mongodb is ready")