Merge pull request #131 from kapkaev/scala_2.13

support scala 2.13

Author: viktortnk

.travis.yml

@@ -10,8 +10,9 @@ before_install:
 language: scala
 
 scala:
-  - 2.12.3
-  - 2.11.11
+  - 2.13.0
+  - 2.12.8
+  - 2.11.12
 
 jdk:
   - oraclejdk8
@@ -29,4 +30,4 @@ cache:
 before_cache:
   # Tricks to avoid unnecessary cache updates
   - find $HOME/.ivy2 -name "ivydata-*.properties" -delete
-  - find $HOME/.sbt -name "*.lock" -delete
+  - find $HOME/.sbt -name "*.lock" -delete

README.md

@@ -23,16 +23,16 @@ There are separate artifacts available for these libraries:
 
 ```scala
 libraryDependencies ++= Seq(
-  "com.whisk" %% "docker-testkit-scalatest" % "0.9.8" % "test",
-  "com.whisk" %% "docker-testkit-impl-spotify" % "0.9.8" % "test")
+  "com.whisk" %% "docker-testkit-scalatest" % "0.9.9" % "test",
+  "com.whisk" %% "docker-testkit-impl-spotify" % "0.9.9" % "test")
 ```
 
 **docker-java**
 
 ```scala
 libraryDependencies ++= Seq(
-  "com.whisk" %% "docker-testkit-scalatest" % "0.9.8" % "test",
-  "com.whisk" %% "docker-testkit-impl-docker-java" % "0.9.8" % "test")
+  "com.whisk" %% "docker-testkit-scalatest" % "0.9.9" % "test",
+  "com.whisk" %% "docker-testkit-impl-docker-java" % "0.9.9" % "test")
 ```
 
 You don't necessarily have to use `scalatest` dependency as demonstrated above.

build.sbt

@@ -1,8 +1,8 @@
 lazy val commonSettings = Seq(
   organization := "com.whisk",
-  version := "0.9.8",
-  scalaVersion := "2.12.3",
-  crossScalaVersions := Seq("2.12.3", "2.11.11", "2.10.6"),
+  version := "0.9.9",
+  scalaVersion := "2.13.0",
+  crossScalaVersions := Seq("2.13.0", "2.12.8", "2.11.12"),
   scalacOptions ++= Seq("-feature", "-deprecation"),
   fork in Test := true,
   licenses += ("MIT", url("http://opensource.org/licenses/MIT")),
@@ -90,7 +90,7 @@ lazy val scalatest =
     .settings(
       name := "docker-testkit-scalatest",
       libraryDependencies ++=
-        Seq("org.scalatest" %% "scalatest" % "3.0.4",
+        Seq("org.scalatest" %% "scalatest" % "3.0.8",
             "ch.qos.logback" % "logback-classic" % "1.2.1" % "test",
             "org.postgresql" % "postgresql" % "9.4.1210" % "test")
     )
@@ -102,7 +102,7 @@ lazy val specs2 =
     .settings(
       name := "docker-testkit-specs2",
       libraryDependencies ++=
-        Seq("org.specs2" %% "specs2-core" % "3.8.6",
+        Seq("org.specs2" %% "specs2-core" % "4.5.1",
             "ch.qos.logback" % "logback-classic" % "1.2.1" % "test",
             "org.postgresql" % "postgresql" % "9.4.1210" % "test")
     )
@@ -115,12 +115,8 @@ lazy val config =
       name := "docker-testkit-config",
       libraryDependencies ++=
         Seq(
-          "com.iheart" %% "ficus" % "1.4.1",
-          "org.scalatest" %% "scalatest" % "3.0.4" % "test"
-        ),
-      publish := scalaVersion map {
-        case x if x.startsWith("2.10") => {}
-        case _                         => publish.value
-      }
+          "com.iheart" %% "ficus" % "1.4.7",
+          "org.scalatest" %% "scalatest" % "3.0.8" % "test"
+        )
     )
     .dependsOn(core, testkitDockerJavaImpl)

config/src/main/scala/com/whisk/docker/config/DockerTypesafeConfig.scala

@@ -60,10 +60,10 @@ object DockerTypesafeConfig extends DockerKitDockerJava {
                           `memory-reservation`: Option[Long]) {
 
     def toDockerContainer(): DockerContainer = {
-      val bindPorts = `port-maps`.fold(EmptyPortBindings) { _.values.map(_.asTuple).toMap } mapValues {
-        maybeHostPort =>
-          DockerPortMapping(maybeHostPort)
-      }
+      val bindPorts = `port-maps`.fold(EmptyPortBindings) { _.values.map(_.asTuple).toMap }.toSeq.map {
+        case (internalPort, maybeHostPort) =>
+          internalPort -> DockerPortMapping(maybeHostPort)
+      }.toMap
 
       val readyChecker = `ready-checker`.fold[DockerReadyChecker](AlwaysReady) { _.toReadyChecker }
 

core/src/main/scala/com/whisk/docker/DockerContainer.scala

@@ -45,7 +45,7 @@ case class DockerContainer(image: String,
   def withEntrypoint(entrypoint: String*) = copy(entrypoint = Some(entrypoint))
 
   def withPorts(ps: (Int, Option[Int])*) =
-    copy(bindPorts = ps.toMap.mapValues(hostPort => DockerPortMapping(hostPort)))
+    copy(bindPorts = ps.map { case (internalPort, hostPort) => internalPort -> DockerPortMapping(hostPort) }.toMap)
 
   def withPortMapping(ps: (Int, DockerPortMapping)*) = copy(bindPorts = ps.toMap)
 

core/src/main/scala/com/whisk/docker/DockerContainerManager.scala

@@ -14,7 +14,7 @@ class DockerContainerManager(containers: Seq[DockerContainer], executor: DockerC
   private implicit val dockerExecutor = executor
 
   private val dockerStatesMap: Map[DockerContainer, DockerContainerState] =
-    containers.map(c => c -> new DockerContainerState(c))(collection.breakOut)
+    containers.map(c => c -> new DockerContainerState(c)).toMap
 
   val states = dockerStatesMap.values.toList
 

notes/0.9.9.markdown

@@ -0,0 +1,9 @@
+#scala #docker #integration-testing
+
+## Highlights
+
+* add cross-compilation for scala [2.13.0](https://github.com/scala/scala/releases/tag/v2.13.0)
+* updated [sbt](https://github.com/sbt/sbt) to 1.2.8
+* updated [scalatest](https://github.com/scalatest/scalatest) to 3.0.8
+* updated [specs2-core](https://github.com/etorreborre/specs2) to 4.5.1
+* updated [ficus](https://github.com/iheartradio/ficus) to 1.4.7

project/build.properties

@@ -1 +1 @@
-sbt.version=1.0.1
+sbt.version=1.2.8