From f34085e31e2d097b06bd7512fab4a9e480c75c36 Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Tue, 5 Jan 2016 12:15:10 +0100 Subject: [PATCH] Upgrade Scala version in scripted tests Both continuations and macro-config set scalaVersion explicitly but since sbt relies now on Scala 2.10 it's not needed anymore. In particular, we can upgrade continuations to 2.10 which makes it easier to work with Java 8. --- sbt/src/sbt-test/compiler-project/macro-config/build.sbt | 2 -- .../sbt-test/source-dependencies/continuations/build.sbt | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sbt/src/sbt-test/compiler-project/macro-config/build.sbt b/sbt/src/sbt-test/compiler-project/macro-config/build.sbt index 2d0ecc8cb..c35214c69 100644 --- a/sbt/src/sbt-test/compiler-project/macro-config/build.sbt +++ b/sbt/src/sbt-test/compiler-project/macro-config/build.sbt @@ -22,5 +22,3 @@ mappings in (Compile, packageSrc) <++= // This can be omitted if the classes in src/macro/ aren't used at runtime mappings in (Compile, packageBin) <++= mappings in (config("macro"), packageBin) - -scalaVersion := "2.10.0-M7" \ No newline at end of file diff --git a/sbt/src/sbt-test/source-dependencies/continuations/build.sbt b/sbt/src/sbt-test/source-dependencies/continuations/build.sbt index b0f2eb814..407a68d5e 100644 --- a/sbt/src/sbt-test/source-dependencies/continuations/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/continuations/build.sbt @@ -1,7 +1,5 @@ autoCompilerPlugins := true -addCompilerPlugin("org.scala-lang.plugins" % "continuations" % "2.9.2") +libraryDependencies += compilerPlugin("org.scala-lang.plugins" % "continuations" % scalaVersion.value) -scalaVersion := "2.9.2" - -scalacOptions += "-P:continuations:enable" \ No newline at end of file +scalacOptions += "-P:continuations:enable"