Merge pull request #749 from vsuharnikov/update-docker-spotify

Updates version of DockerSpotifyClient to 3.5.13 and fixes NullPointerException

Author: muuki88

build.sbt

@@ -11,7 +11,7 @@ libraryDependencies ++= Seq(
     // for jdkpackager
     "org.apache.ant" % "ant" % "1.9.6",
     // these dependencies have to be explicitly added by the user
-    "com.spotify" % "docker-client" % "3.2.1" % "provided",
+    "com.spotify" % "docker-client" % "3.5.13" % "provided",
     "org.vafer" % "jdeb" % "1.3"  % "provided" artifacts (Artifact("jdeb", "jar", "jar")),
     "org.scalatest" %% "scalatest" % "2.2.4" % "test"
 )

src/main/scala/com/typesafe/sbt/packager/docker/DockerSpotifyClientPlugin.scala

@@ -6,7 +6,7 @@ import java.nio.file.Paths
 
 import com.spotify.docker.client.messages.ProgressMessage
 import com.spotify.docker.client.{ ProgressHandler, DockerClient, DefaultDockerClient }
-import com.spotify.docker.client.DockerClient.BuildParameter._
+import com.spotify.docker.client.DockerClient.BuildParam
 import sbt._
 import sbt.Keys._
 import packager.Keys._
@@ -42,7 +42,7 @@ import universal.UniversalPlugin.autoImport.stage
  * and add the dependency in your `plugins.sbt`
  * 
  * {{{
- *   libraryDependencies += "com.spotify" % "docker-client" % "3.2.1"
+ *   libraryDependencies += "com.spotify" % "docker-client" % "3.5.13"
  * }}}
  * 
  * The Docker-spotify client is a provided dependency so you have to add it on your own. 
@@ -77,10 +77,10 @@ object DockerSpotifyClientPlugin extends AutoPlugin {
       def progress(message: ProgressMessage) = {
         Option(message.error()) match {
           case Some(error) if error.nonEmpty => log.error(message.error())
-          case _ => log.info(message.stream())
+          case _ => Option(message.stream()) foreach (v => log.info(v))
         }
       }
-    }, FORCE_RM)
+    }, BuildParam.forceRm())
 
     if (latest) {
       val name = tag.substring(0, tag.lastIndexOf(":")) + ":latest"

src/sbt-test/docker/spotify-client/project/plugins.sbt

@@ -1,4 +1,4 @@
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))
 
 // needs to be added for the docker spotify client
-libraryDependencies += "com.spotify" % "docker-client" % "3.2.1"
+libraryDependencies += "com.spotify" % "docker-client" % "3.5.13"

src/sphinx/formats/docker.rst

@@ -53,7 +53,7 @@ and this to your ``plugins.sbt``
 
 .. code-block:: scala
 
-  libraryDependencies += "com.spotify" % "docker-client" % "3.2.1"
+  libraryDependencies += "com.spotify" % "docker-client" % "3.5.13"
 
 The Docker-spotify client is a provided dependency so you have to add it on your own. 
 It brings a lot of dependenciesthat could slow your build times. This is the reason 

test-project-docker/project/plugins.sbt

@@ -3,4 +3,4 @@ lazy val root = Project("plugins", file(".")).dependsOn(plugin)
 lazy val plugin = file("../").getCanonicalFile.toURI
 
 // needs to be added for the docker spotify client
-libraryDependencies += "com.spotify" % "docker-client" % "3.2.1"
+libraryDependencies += "com.spotify" % "docker-client" % "3.5.13"