Skip to content

Commit

Permalink
Update to latest scala versions (#261)
Browse files Browse the repository at this point in the history
* Update scala 2.12.6 to 2.12.8

* Update sbt-scalajs to 0.6.28

* Update scalatest to 3.0.8-RC5

* Update scala 2.13.0-RC2 to 2.13.0-RC3
  • Loading branch information
Philippus authored and barkhorn committed May 31, 2019
1 parent 10b0952 commit 34ff222
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ install:

scala:
- "2.11.12"
- "2.12.6"
- "2.13.0-RC2"
- "2.12.8"
- "2.13.0-RC3"

jdk:
- openjdk8
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import sbtcrossproject.CrossPlugin.autoImport.crossProject

scalaVersion in ThisBuild := "2.11.12"
crossScalaVersions in ThisBuild := Seq("2.11.12", "2.12.6", "2.13.0-RC2")
crossScalaVersions in ThisBuild := Seq("2.11.12", "2.12.8", "2.13.0-RC3")
scalaJSUseRhino in ThisBuild := true

lazy val scalatest = "org.scalatest" %% "scalatest" % "3.0.8-RC4"
lazy val scalatest = "org.scalatest" %% "scalatest" % "3.0.8-RC5"
lazy val specs2 = "org.specs2" %% "specs2-core" % "4.5.1"

val commonSettings = Defaults.coreDefaultSettings ++ Seq(
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
//addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0-M2")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")

0 comments on commit 34ff222

Please sign in to comment.