diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-09-09 00:47:16 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-09-09 00:47:16 -0700 |
| commit | de9fe9413579af4652adde4f6118e8de738b22ac (patch) | |
| tree | 48c624117807dd92bb64629f6b03fe94c64ca9e2 | |
| parent | b096870030d5afd77389d18bdf201389e102580a (diff) | |
| download | sbt-jni-de9fe9413579af4652adde4f6118e8de738b22ac.tar.gz sbt-jni-de9fe9413579af4652adde4f6118e8de738b22ac.tar.bz2 sbt-jni-de9fe9413579af4652adde4f6118e8de738b22ac.zip | |
Upgrade to scala 2.12.0-RC1
| -rw-r--r-- | plugin/src/sbt-test/sbt-jni/simple/build.sbt | 2 | ||||
| -rw-r--r-- | plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala | 2 | ||||
| -rw-r--r-- | project/SbtJniBuild.scala | 2 |
3 files changed, 3 insertions, 3 deletions
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 ) diff --git a/project/SbtJniBuild.scala b/project/SbtJniBuild.scala index 410b6a8..56e0866 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-M5") + val scalaVersions: Seq[String] = List("2.11.8", "2.10.6", "2.12.0-RC1") val macrosParadiseVersion = "2.1.0" val commonSettings = Seq( |