Upgrade to Scala 2.10.2.

DylanArnold · Sep 23, 2013 · 88e16b7 · 88e16b7
1 parent 03df481
commit 88e16b7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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