From 769cc0bb40f0fd3a9b68f0c0700b520de58f9c01 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Mon, 7 Nov 2016 11:04:20 -0800 Subject: Upgrade Scala to 2.12.0 --- plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala | 2 +- project/SbtJniBuild.scala | 2 +- 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( -- cgit v1.2.3