diff --git a/MIGRATION.md b/MIGRATION.md index 8435b3448..190310c93 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -6,7 +6,7 @@ Migration notes - `Project(...)` constructor is restricted down to two parameters. Use `project` instead. - `sbt.Plugin` is also gone. Use auto plugins. - The incremental compiler, called Zinc, uses class-based name hashing. -- Zinc drops support for Scala 2.8.x and 2.9.x. +- Zinc drops support for Scala 2.8.x, 2.9.x., 2.11.1 and below. - Removed the pre-0.13.7 *.sbt file parser (previously available under `-Dsbt.parser.simple=true`) - Removed old, hyphen-separated key names (use `publishLocal` instead of `publish-local`) - Removes no-longer-documented old operators `<<=`, `<+=`, and `<++=`. diff --git a/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt b/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt index c590b6d8f..76fe81985 100644 --- a/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt +++ b/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt @@ -1,8 +1,8 @@ name := "foo" -scalaVersion := "2.10.4" +scalaVersion := "2.10.6" -crossScalaVersions := List("2.10.4", "2.11.0") +crossScalaVersions := List("2.10.6", "2.11.8") incOptions := incOptions.value.withClassfileManagerType( xsbti.Maybe.just(new xsbti.compile.TransactionalManagerType( diff --git a/sbt/src/sbt-test/tests/scala-instance-classloader/build.sbt b/sbt/src/sbt-test/tests/scala-instance-classloader/build.sbt index 4edba5005..54ff69556 100644 --- a/sbt/src/sbt-test/tests/scala-instance-classloader/build.sbt +++ b/sbt/src/sbt-test/tests/scala-instance-classloader/build.sbt @@ -4,7 +4,7 @@ lazy val OtherScala = config("other-scala").hide configs(OtherScala) -libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.1" % OtherScala.name +libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.8" % OtherScala.name managedClasspath in OtherScala := Classpaths.managedJars(OtherScala, classpathTypes.value, update.value) @@ -13,7 +13,7 @@ scalaInstance := { val rawJars = (managedClasspath in OtherScala).value.map(_.data) val scalaHome = (target.value / "scala-home") def removeVersion(name: String): String = - name.replaceAll("\\-2.11.1", "") + name.replaceAll("\\-2.11.8", "") for(jar <- rawJars) { val tjar = scalaHome / s"lib/${removeVersion(jar.getName)}" IO.copyFile(jar, tjar) @@ -27,6 +27,6 @@ libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.3.3" % "test" -scalaVersion := "2.11.0" +scalaVersion := "2.11.8" ivyScala := ivyScala.value map (_.withOverrideScalaVersion(sbtPlugin.value))