From de9fe9413579af4652adde4f6118e8de738b22ac Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Fri, 9 Sep 2016 00:47:16 -0700 Subject: Upgrade to scala 2.12.0-RC1 --- plugin/src/sbt-test/sbt-jni/simple/build.sbt | 2 +- plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugin') diff --git a/plugin/src/sbt-test/sbt-jni/simple/build.sbt b/plugin/src/sbt-test/sbt-jni/simple/build.sbt index a361b6f..cd490b0 100644 --- a/plugin/src/sbt-test/sbt-jni/simple/build.sbt +++ b/plugin/src/sbt-test/sbt-jni/simple/build.sbt @@ -4,7 +4,7 @@ lazy val root = (project in file(".")). aggregate(core, native) lazy val core = (project in file("core")). - settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.0-RC4" % "test"). + settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.0" % "test"). settings(target in javah := (sourceDirectory in nativeCompile in native).value / "include"). dependsOn(native % Runtime) 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 846f777..938bb95 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-M5"), + crossScalaVersions := Seq("2.11.8", "2.10.6", "2.12.0-RC1"), scalaVersion := crossScalaVersions.value.head ) -- cgit v1.2.3