Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add scala-2.13 target #47

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add scala-2.13 target #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

10 changes: 5 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -46,16 +46,16 @@ 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
}
}

libraryDependencies ++= Seq (
"org.scalatest" %% "scalatest" % "3.0.0" % "test",
"org.scalatest" %% "scalatest" % "3.0.8" % "test",
"org.mockito" % "mockito-all" % "1.10.8" % "test"
)

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=1.3.5
8 changes: 3 additions & 5 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
6 changes: 3 additions & 3 deletions src/test/scala/io/github/cloudify/scala/spdf/DestinationDocumentLikeSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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)
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/test/scala/io/github/cloudify/scala/spdf/SourceDocumentLikeSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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)
}

}
Expand Down