aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2017-04-19 11:49:58 -0500
committerJakob Odersky <jakob@odersky.com>2017-04-19 11:49:58 -0500
commit01948e257160697b99a4fd58ca9a7bf9a2e558ff (patch)
treec7da8c9921a6b751a0f17c36288dd0611aa17fd6
parent4f9df08c6884309db31dda5d3793ca431ee407ae (diff)
downloadsbt-jni-01948e257160697b99a4fd58ca9a7bf9a2e558ff.tar.gz
sbt-jni-01948e257160697b99a4fd58ca9a7bf9a2e558ff.tar.bz2
sbt-jni-01948e257160697b99a4fd58ca9a7bf9a2e558ff.zip
Upgrade Scala to 2.12.2 and 2.11.11v1.2.6
-rw-r--r--build.sbt2
-rw-r--r--plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/build.sbt b/build.sbt
index bdf488d..ac5f26f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-val scalaVersions = Seq("2.12.1", "2.11.8", "2.10.6")
+val scalaVersions = Seq("2.12.2", "2.11.11", "2.10.6")
val macrosParadiseVersion = "2.1.0"
// version is derived from latest git tag
diff --git a/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala b/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala
index 2c15a92..c0b403a 100644
--- a/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala
+++ b/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala
@@ -8,7 +8,7 @@ object ScriptedHelper extends AutoPlugin {
override def projectSettings = Seq(
scalacOptions ++= Seq("-feature", "-deprecation"),
- crossScalaVersions := Seq("2.11.8", "2.10.6", "2.12.1"),
+ crossScalaVersions := Seq("2.12.2", "2.11.11", "2.10.6"),
scalaVersion := crossScalaVersions.value.head
)