Skip to content

Commit

Permalink
Merge pull request #51 from xuwei-k/Scala-2.13.0-M1
Browse files Browse the repository at this point in the history
support Scala 2.13.0-M1
  • Loading branch information
dwijnand committed Jun 26, 2017
2 parents 45133f7 + 9a74642 commit 7e3c112
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ scala:
- 2.10.6
- 2.11.11
- 2.12.2

- 2.13.0-M1
jdk:
- oraclejdk8
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)

Expand Down
3 changes: 2 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

0 comments on commit 7e3c112

Please sign in to comment.