aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-11-07 11:04:20 -0800
committerJakob Odersky <jakob@odersky.com>2016-11-07 11:04:20 -0800
commit769cc0bb40f0fd3a9b68f0c0700b520de58f9c01 (patch)
treee04f126bb85b04e5b3fe35597665ca3ac9051bc5
parentb182d0df2eb0c1372fe3605b0b5b07c7d9ecf308 (diff)
downloadsbt-jni-769cc0bb40f0fd3a9b68f0c0700b520de58f9c01.tar.gz
sbt-jni-769cc0bb40f0fd3a9b68f0c0700b520de58f9c01.tar.bz2
sbt-jni-769cc0bb40f0fd3a9b68f0c0700b520de58f9c01.zip
Upgrade Scala to 2.12.0
-rw-r--r--plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala2
-rw-r--r--project/SbtJniBuild.scala2
2 files changed, 2 insertions, 2 deletions
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 3b3bc83..c2d7583 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-RC2"),
+ crossScalaVersions := Seq("2.11.8", "2.10.6", "2.12.0"),
scalaVersion := crossScalaVersions.value.head
)
diff --git a/project/SbtJniBuild.scala b/project/SbtJniBuild.scala
index fcf7a2a..c0fd7fb 100644
--- a/project/SbtJniBuild.scala
+++ b/project/SbtJniBuild.scala
@@ -10,7 +10,7 @@ import com.typesafe.sbt.SbtScalariform.ScalariformKeys
object SbtJniBuild extends Build {
- val scalaVersions: Seq[String] = List("2.11.8", "2.10.6", "2.12.0-RC2")
+ val scalaVersions: Seq[String] = List("2.11.8", "2.10.6", "2.12.0")
val macrosParadiseVersion = "2.1.0"
val commonSettings = Seq(