diff options
author | Jakob Odersky <jakob@odersky.com> | 2016-12-05 16:57:08 -0800 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2016-12-05 16:57:08 -0800 |
commit | 3411baee9223dc5bed7596926244e1db0c34a3ab (patch) | |
tree | c5787d050558c892ce31fc0feea80ace0a27dd70 | |
parent | bbf3b0364a8a62cd2c5feb20728e0f7f0bd3f776 (diff) | |
download | sbt-jni-3411baee9223dc5bed7596926244e1db0c34a3ab.tar.gz sbt-jni-3411baee9223dc5bed7596926244e1db0c34a3ab.tar.bz2 sbt-jni-3411baee9223dc5bed7596926244e1db0c34a3ab.zip |
Upgrade scala to 2.12.1v1.2.5
-rw-r--r-- | build.sbt | 2 | ||||
-rw-r--r-- | plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -val scalaVersions = Seq("2.12.0", "2.11.8", "2.10.6") +val scalaVersions = Seq("2.12.1", "2.11.8", "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 c2d7583..2c15a92 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.0"), + crossScalaVersions := Seq("2.11.8", "2.10.6", "2.12.1"), scalaVersion := crossScalaVersions.value.head ) |