From 9a746429c5bee1f3f89ed480d65a8bd1582638da Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 25 Jun 2017 18:08:01 +0900 Subject: [PATCH] support Scala 2.13.0-M1 --- .travis.yml | 2 +- build.sbt | 2 +- project/Dependencies.scala | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4da1aced..4fc3b720 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,6 @@ scala: - 2.10.6 - 2.11.11 - 2.12.2 - + - 2.13.0-M1 jdk: - oraclejdk8 diff --git a/build.sbt b/build.sbt index c444b7ad..6af716f7 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ def commonSettings: Seq[Setting[_]] = Seq( scalacOptions in Compile in compile += "-Xfatal-warnings", scalacOptions --= ifScala210Minus("-Ywarn-unused").value.toList, // WORKAROUND sbt/sbt-houserules#14 scalacOptions --= ifScala210Minus("-Ywarn-unused-import").value.toList, // WORKAROUND sbt/sbt-houserules#14 - crossScalaVersions := Seq(scala210, scala211, scala212), + crossScalaVersions := Seq(scala210, scala211, scala212, scala213), // mimaPreviousArtifacts := Set.empty // Set(organization.value %% moduleName.value % "1.0.0") ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6a095140..ebf4d666 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,9 +5,10 @@ object Dependencies { val scala210 = "2.10.6" val scala211 = "2.11.11" val scala212 = "2.12.2" + val scala213 = "2.13.0-M1" val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value } val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.4" - val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" + val scalatest = "org.scalatest" %% "scalatest" % "3.0.3" }