Merge pull request #42 from larsrh/topic/2.12

Scala 2.12.0-RC2
alexarchambault · Oct 20, 2016 · 1f4754f · 1f4754f
2 parents 7cdb62c + 1b2edc9
commit 1f4754f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: scala
 scala:
-- 2.12.0-M5
+- 2.12.0-RC2
 - 2.11.8
 - 2.10.6
 jdk:

diff --git a/build.sbt b/build.sbt
@@ -59,7 +59,7 @@ lazy val doc = project
 lazy val commonSettings = Seq(
   organization := "com.github.alexarchambault",
   scalaVersion := "2.11.8",
-  crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0-M5"),
+  crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0-RC2"),
   resolvers ++= Seq(
     Resolver.sonatypeRepo("releases")
   ),

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,7 +5,7 @@ resolvers += Resolver.url(
 )
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.4")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")
+addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.5")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
 
 addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14-3")