From 881e810ce217b45ea67528fda4440cd53d4376ae Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 6 Nov 2017 00:25:31 -0500 Subject: [PATCH] Update actions/* for JDK 9 --- sbt/src/sbt-test/actions/doc-file-options/build.sbt | 2 +- sbt/src/sbt-test/actions/doc-scala-instance/build.sbt | 4 ++-- sbt/src/sbt-test/actions/generator/build.sbt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sbt/src/sbt-test/actions/doc-file-options/build.sbt b/sbt/src/sbt-test/actions/doc-file-options/build.sbt index be9255579..51939a8e4 100644 --- a/sbt/src/sbt-test/actions/doc-file-options/build.sbt +++ b/sbt/src/sbt-test/actions/doc-file-options/build.sbt @@ -2,7 +2,7 @@ val newContents = "bbbbbbbbb" val rootContentFile = "root.txt" -scalaVersion := "2.10.2" +scalaVersion := "2.10.7" scalacOptions in (Compile, doc) := Seq("-doc-root-content", rootContentFile) diff --git a/sbt/src/sbt-test/actions/doc-scala-instance/build.sbt b/sbt/src/sbt-test/actions/doc-scala-instance/build.sbt index 549ec33c7..dbae5209f 100644 --- a/sbt/src/sbt-test/actions/doc-scala-instance/build.sbt +++ b/sbt/src/sbt-test/actions/doc-scala-instance/build.sbt @@ -1,10 +1,10 @@ lazy val a = project.settings( - scalaVersion := "2.9.2", + scalaVersion := "2.11.12", scalaInstance in (Compile,doc) := (scalaInstance in b).value, // 2.10.1-only, so this will only succeed if `doc` recognizes the more specific scalaInstance scoped to `doc` scalacOptions in (Compile,doc) += "-implicits" ) lazy val b = project.settings( - scalaVersion := "2.10.1" + scalaVersion := "2.10.7" ) diff --git a/sbt/src/sbt-test/actions/generator/build.sbt b/sbt/src/sbt-test/actions/generator/build.sbt index c347b414e..f00e10818 100644 --- a/sbt/src/sbt-test/actions/generator/build.sbt +++ b/sbt/src/sbt-test/actions/generator/build.sbt @@ -2,7 +2,7 @@ lazy val buildInfo = taskKey[Seq[File]]("The task that generates the build info. lazy val root = (project in file(".")) .settings( - scalaVersion := "2.11.8", + scalaVersion := "2.11.12", buildInfo := { val x = sourceManaged.value / "BuildInfo.scala" IO.write(x, """object BuildInfo""")