diff --git a/.travis.yml b/.travis.yml index a0f1bb3..be97784 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: scala scala: - - "2.10.6" - - "2.11.8" - - "2.12.0" + - "2.10.7" + - "2.11.12" + - "2.12.10" + - "2.13.1" jdk: - - oraclejdk8 + - openjdk8 diff --git a/build.sbt b/build.sbt index fb019dd..f797ba7 100644 --- a/build.sbt +++ b/build.sbt @@ -13,9 +13,9 @@ licenses := Seq( organization := "io.github.cloudify" -scalaVersion := "2.12.0" +scalaVersion := "2.13.1" -crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0") +crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.10", "2.13.1") releaseCrossBuild := true @@ -46,8 +46,8 @@ libraryDependencies := { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, scalaMajor)) if scalaMajor >= 11 => libraryDependencies.value ++ Seq( - "org.scala-lang.modules" %% "scala-xml" % "1.0.6", - "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4" + "org.scala-lang.modules" %% "scala-xml" % "1.2.0", + "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2" ) case _ => libraryDependencies.value @@ -55,7 +55,7 @@ libraryDependencies := { } libraryDependencies ++= Seq ( - "org.scalatest" %% "scalatest" % "3.0.0" % "test", + "org.scalatest" %% "scalatest" % "3.0.8" % "test", "org.mockito" % "mockito-all" % "1.10.8" % "test" ) diff --git a/project/build.properties b/project/build.properties index 27e88aa..6624da7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version=1.3.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index 31ea0e8..3acd8b2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,3 @@ -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") - -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") - -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0") +addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.10") diff --git a/src/test/scala/io/github/cloudify/scala/spdf/DestinationDocumentLikeSpec.scala b/src/test/scala/io/github/cloudify/scala/spdf/DestinationDocumentLikeSpec.scala index 66e876c..4c3ab37 100644 --- a/src/test/scala/io/github/cloudify/scala/spdf/DestinationDocumentLikeSpec.scala +++ b/src/test/scala/io/github/cloudify/scala/spdf/DestinationDocumentLikeSpec.scala @@ -4,8 +4,8 @@ import java.io.{OutputStream, ByteArrayOutputStream, File} import io.github.cloudify.scala.spdf.DestinationDocumentLike.{OutputStreamDestinationDocument, FileDestinationDocument} import scala.sys.process._ import org.scalatest.WordSpec -import org.scalatest.mockito.MockitoSugar import org.scalatest.Matchers +import org.scalatestplus.mockito.MockitoSugar class DestinationDocumentLikeSpec extends WordSpec with Matchers with MockitoSugar { @@ -15,11 +15,11 @@ class DestinationDocumentLikeSpec extends WordSpec with Matchers with MockitoSug "DestinationDocumentLike" should { "set commandParameter to -" in { - new DestinationDocumentLike[Unit] {}.commandParameter(Unit) should equal("-") + new DestinationDocumentLike[Unit] {}.commandParameter(()) should equal("-") } "leave process untouched" in new catProcess { - new DestinationDocumentLike[Unit] {}.sinkTo(Unit)(process) should equal(process) + new DestinationDocumentLike[Unit] {}.sinkTo(())(process) should equal(process) } } diff --git a/src/test/scala/io/github/cloudify/scala/spdf/SourceDocumentLikeSpec.scala b/src/test/scala/io/github/cloudify/scala/spdf/SourceDocumentLikeSpec.scala index b292871..59cedf1 100644 --- a/src/test/scala/io/github/cloudify/scala/spdf/SourceDocumentLikeSpec.scala +++ b/src/test/scala/io/github/cloudify/scala/spdf/SourceDocumentLikeSpec.scala @@ -6,7 +6,7 @@ import java.io.{ File, ByteArrayInputStream } import java.net.URL import org.scalatest.WordSpec import org.scalatest.Matchers -import org.scalatest.mockito.MockitoSugar +import org.scalatestplus.mockito.MockitoSugar class SourceDocumentLikeSpec extends WordSpec with Matchers with MockitoSugar { @@ -43,11 +43,11 @@ class SourceDocumentLikeSpec extends WordSpec with Matchers with MockitoSugar { "SourceDocumentLike" should { "set commandParameter to -" in { - new SourceDocumentLike[Unit] {}.commandParameter(Unit) should equal("-") + new SourceDocumentLike[Unit] {}.commandParameter(()) should equal("-") } "leave process untouched" in { - new SourceDocumentLike[Unit] {}.sourceFrom(Unit)(catProcess) should equal(catProcess) + new SourceDocumentLike[Unit] {}.sourceFrom(())(catProcess) should equal(catProcess) } }