Merge pull request #141 from Philippus/fix-deprecation-warnings

Fix/silence deprecation warnings and update dependencies

build.sbt

@@ -12,8 +12,8 @@ lazy val root = (project in file("."))
   )
 
 libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest" % "3.2.11" % "test",
-  "org.apache.commons" % "commons-lang3" % "3.12.0"
+  "org.scalatest" %% "scalatest" % "3.2.19" % "test",
+  "org.apache.commons" % "commons-text" % "1.11.0"
 )
 
 scalacOptions := Seq("-deprecation", "-unchecked", "-feature")

project/build.properties

@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.10.5

project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
+addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
 
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

src/main/scala/sbtdocker/DockerSettings.scala

@@ -1,12 +1,15 @@
 package sbtdocker
 
+import scala.annotation.nowarn
+
 import sbt.Keys.target
 import sbt._
 import sbtdocker.DockerKeys._
 import sbtdocker.staging.DefaultDockerfileProcessor
 
 object DockerSettings {
 
+  @nowarn("msg=value imageName in object DockerKeys is deprecated")
   lazy val baseDockerSettings = Seq(
     docker := {
       val log = Keys.streams.value.log
@@ -68,7 +71,7 @@ object DockerSettings {
       (docker / Keys.mainClass).or(Compile / Keys.packageBin / Keys.mainClass).value
     },
     docker / dockerfile := {
-      val maybeMainClass = Keys.mainClass.in(docker).value
+      val maybeMainClass = (docker / Keys.mainClass).value
       maybeMainClass match {
         case None =>
           sys.error(

src/main/scala/sbtdocker/DockerTag.scala

@@ -20,7 +20,7 @@ object DockerTag {
 
     val command = dockerPath :: "tag" :: id.id :: name.toString :: Nil
 
-    val processOutput = Process(command).lines(processLogger)
+    val processOutput = Process(command).lineStream(processLogger)
     processOutput.foreach { line =>
       log.info(line)
     }

src/main/scala/sbtdocker/Instructions.scala

@@ -1,6 +1,6 @@
 package sbtdocker
 
-import org.apache.commons.lang3.StringEscapeUtils
+import org.apache.commons.text.StringEscapeUtils
 import sbtdocker.staging.SourceFile
 
 import scala.concurrent.duration.FiniteDuration