Skip to content
Permalink
Browse files

Scala 2.13.0

  • Loading branch information...
xuwei-k committed Jun 11, 2019
1 parent 85e7cfa commit dd3f8cb8f77b0aef2fb8038fbede212aa7825a9d
Showing with 12 additions and 3 deletions.
  1. +1 −1 .travis.yml
  2. +11 −2 build.sbt
@@ -4,7 +4,7 @@ jdk: oraclejdk8
scala:
- 2.11.12
- 2.12.8
- 2.13.0-RC1
- 2.13.0
script:
- sbt "++ ${TRAVIS_SCALA_VERSION}" test "scalaParser/testOnly scalaparser.SnippetSpec"
matrix:
@@ -13,7 +13,7 @@ val commonSettings = Seq(
scmInfo := Some(ScmInfo(url("https://github.com/sirthias/parboiled2"), "scm:git:git@github.com:sirthias/parboiled2.git")),

scalaVersion := "2.12.8",
crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-RC1"),
crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0"),

scalacOptions ++= Seq(
"-deprecation",
@@ -127,8 +127,17 @@ lazy val parboiledOsgiSettings = osgiSettings ++ Seq(

/////////////////////// DEPENDENCIES /////////////////////////

val utestVersion = Def.setting(
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, v)) if v <= 11 =>
"0.6.8"
case _ =>
"0.6.9"
}
)

val shapeless = Def.setting("com.chuusai" %%% "shapeless" % "2.3.3" % "compile")
val utest = Def.setting("com.lihaoyi" %%% "utest" % "0.6.7" % Test)
val utest = Def.setting("com.lihaoyi" %%% "utest" % utestVersion.value % Test)
val scalaCheck = Def.setting("org.scalacheck" %%% "scalacheck" % "1.14.0" % Test)
val `scala-reflect` = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided")

0 comments on commit dd3f8cb

Please sign in to comment.
You can’t perform that action at this time.