diff --git a/project/ScalaJSBuild.scala b/project/ScalaJSBuild.scala index 486b1bc7eb..d6b143e076 100644 --- a/project/ScalaJSBuild.scala +++ b/project/ScalaJSBuild.scala @@ -9,7 +9,7 @@ import SourceMapCat.catJSFilesAndTheirSourceMaps object ScalaJSBuild extends Build { - val scalajsScalaVersion = "2.10.1" + val scalajsScalaVersion = "2.10.2" val commonSettings = Defaults.defaultSettings ++ Seq( organization := "ch.epfl.lamp", diff --git a/sbt-plugin/src/main/scala/ch/epfl/lamp/sbtscalajs/ScalaJSPlugin.scala b/sbt-plugin/src/main/scala/ch/epfl/lamp/sbtscalajs/ScalaJSPlugin.scala index 30409ea944..2d2d403bd8 100644 --- a/sbt-plugin/src/main/scala/ch/epfl/lamp/sbtscalajs/ScalaJSPlugin.scala +++ b/sbt-plugin/src/main/scala/ch/epfl/lamp/sbtscalajs/ScalaJSPlugin.scala @@ -399,7 +399,7 @@ object ScalaJSPlugin extends Plugin { val scalaJSSettings: Seq[Setting[_]] = scalaJSAbstractSettings ++ Seq( // you had better use the same version of Scala as Scala.js - scalaVersion := "2.10.1", + scalaVersion := "2.10.2", // you will need the Scala.js compiler on the classpath libraryDependencies += "ch.epfl.lamp" %% "scalajs-compiler" % "0.1-SNAPSHOT", diff --git a/scalalib/source b/scalalib/source index 33e32179fd..60d462ef6e 160000 --- a/scalalib/source +++ b/scalalib/source @@ -1 +1 @@ -Subproject commit 33e32179fd6dcf06554b817f54b97ac5a6e052ab +Subproject commit 60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a