Skip to content

Commit c65f8bf

Browse files
committed
add scala-2.13 target
1 parent ac3f7f3 commit c65f8bf

File tree

6 files changed

+20
-21
lines changed

6 files changed

+20
-21
lines changed

.travis.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
language: scala
22
scala:
3-
- "2.10.6"
4-
- "2.11.8"
5-
- "2.12.0"
3+
- "2.10.7"
4+
- "2.11.12"
5+
- "2.12.10"
6+
- "2.13.1"
67
jdk:
7-
- oraclejdk8
8+
- openjdk8
89

build.sbt

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ licenses := Seq(
1313

1414
organization := "io.github.cloudify"
1515

16-
scalaVersion := "2.12.0"
16+
scalaVersion := "2.13.1"
1717

18-
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0")
18+
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.10", "2.13.1")
1919

2020
releaseCrossBuild := true
2121

@@ -46,16 +46,16 @@ libraryDependencies := {
4646
CrossVersion.partialVersion(scalaVersion.value) match {
4747
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
4848
libraryDependencies.value ++ Seq(
49-
"org.scala-lang.modules" %% "scala-xml" % "1.0.6",
50-
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4"
49+
"org.scala-lang.modules" %% "scala-xml" % "1.2.0",
50+
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
5151
)
5252
case _ =>
5353
libraryDependencies.value
5454
}
5555
}
5656

5757
libraryDependencies ++= Seq (
58-
"org.scalatest" %% "scalatest" % "3.0.0" % "test",
58+
"org.scalatest" %% "scalatest" % "3.0.8" % "test",
5959
"org.mockito" % "mockito-all" % "1.10.8" % "test"
6060
)
6161

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=1.3.5

project/plugins.sbt

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
2-
3-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
4-
5-
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
1+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
2+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
3+
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.10")

src/test/scala/io/github/cloudify/scala/spdf/DestinationDocumentLikeSpec.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import java.io.{OutputStream, ByteArrayOutputStream, File}
44
import io.github.cloudify.scala.spdf.DestinationDocumentLike.{OutputStreamDestinationDocument, FileDestinationDocument}
55
import scala.sys.process._
66
import org.scalatest.WordSpec
7-
import org.scalatest.mockito.MockitoSugar
87
import org.scalatest.Matchers
8+
import org.scalatestplus.mockito.MockitoSugar
99

1010
class DestinationDocumentLikeSpec extends WordSpec with Matchers with MockitoSugar {
1111

@@ -15,11 +15,11 @@ class DestinationDocumentLikeSpec extends WordSpec with Matchers with MockitoSug
1515

1616
"DestinationDocumentLike" should {
1717
"set commandParameter to -" in {
18-
new DestinationDocumentLike[Unit] {}.commandParameter(Unit) should equal("-")
18+
new DestinationDocumentLike[Unit] {}.commandParameter(()) should equal("-")
1919
}
2020

2121
"leave process untouched" in new catProcess {
22-
new DestinationDocumentLike[Unit] {}.sinkTo(Unit)(process) should equal(process)
22+
new DestinationDocumentLike[Unit] {}.sinkTo(())(process) should equal(process)
2323
}
2424
}
2525

src/test/scala/io/github/cloudify/scala/spdf/SourceDocumentLikeSpec.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import java.io.{ File, ByteArrayInputStream }
66
import java.net.URL
77
import org.scalatest.WordSpec
88
import org.scalatest.Matchers
9-
import org.scalatest.mockito.MockitoSugar
9+
import org.scalatestplus.mockito.MockitoSugar
1010

1111
class SourceDocumentLikeSpec extends WordSpec with Matchers with MockitoSugar {
1212

@@ -43,11 +43,11 @@ class SourceDocumentLikeSpec extends WordSpec with Matchers with MockitoSugar {
4343
"SourceDocumentLike" should {
4444

4545
"set commandParameter to -" in {
46-
new SourceDocumentLike[Unit] {}.commandParameter(Unit) should equal("-")
46+
new SourceDocumentLike[Unit] {}.commandParameter(()) should equal("-")
4747
}
4848

4949
"leave process untouched" in {
50-
new SourceDocumentLike[Unit] {}.sourceFrom(Unit)(catProcess) should equal(catProcess)
50+
new SourceDocumentLike[Unit] {}.sourceFrom(())(catProcess) should equal(catProcess)
5151
}
5252

5353
}

0 commit comments

Comments
 (0)