diff --git a/project/Sbt.scala b/project/Sbt.scala index c226a3cd3..3fa63dbd9 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -16,7 +16,7 @@ object Sbt extends Build organization := "org.scala-sbt", version := "0.13.5-M1", publishArtifact in packageDoc := false, - scalaVersion := "2.10.3", + scalaVersion := "2.10.4", publishMavenStyle := false, componentID := None, crossPaths := false, diff --git a/src/sphinx/Community/Changes.rst b/src/sphinx/Community/Changes.rst index 07e518a3e..600a28f68 100644 --- a/src/sphinx/Community/Changes.rst +++ b/src/sphinx/Community/Changes.rst @@ -2,6 +2,10 @@ Changes ======= +0.13.2 to 0.13.5 +~~~~~~~~~~~~~~~~ +- The Scala version for sbt and sbt plugins is now 2.10.4. This is a compatible version bump. + 0.13.1 to 0.13.2 ~~~~~~~~~~~~~~~~ - Adding new name-hashing feature to incremental compiler. Alters how scala dependencies are tracked, reducing number of recompiles necessary. diff --git a/src/sphinx/Getting-Started/Basic-Def.rst b/src/sphinx/Getting-Started/Basic-Def.rst index e1cb36b7a..a89248f76 100644 --- a/src/sphinx/Getting-Started/Basic-Def.rst +++ b/src/sphinx/Getting-Started/Basic-Def.rst @@ -72,7 +72,7 @@ Here's an example: version := "1.0" - scalaVersion := "2.10.3" + scalaVersion := "2.10.4" Each `Setting` is defined with a Scala expression. The expressions in `build.sbt` are independent of one another, and