aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-07-04 14:24:48 -0700
committerJakob Odersky <jakob@odersky.com>2016-07-04 14:44:13 -0700
commit33f7af36fa40da40be7ff6c6bc6f0d6f9f37e443 (patch)
tree847c698d537720e2efcde9cf5489f5c112385114
parente2e53acfb56dfff2d6e1caf5313f8fa516b54f4b (diff)
downloadsbt-jni-33f7af36fa40da40be7ff6c6bc6f0d6f9f37e443.tar.gz
sbt-jni-33f7af36fa40da40be7ff6c6bc6f0d6f9f37e443.tar.bz2
sbt-jni-33f7af36fa40da40be7ff6c6bc6f0d6f9f37e443.zip
Upgrade to scala 2.12.0-M5
-rw-r--r--plugin/src/sbt-test/sbt-jni/simple/build.sbt2
-rw-r--r--plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala2
-rw-r--r--project/SbtJniBuild.scala2
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 78f3135..a361b6f 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" % "2.2.6" % "test").
+ settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.0-RC4" % "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 bfec913..846f777 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-M4"),
+ crossScalaVersions := Seq("2.11.8", "2.10.6", "2.12.0-M5"),
scalaVersion := crossScalaVersions.value.head
)
diff --git a/project/SbtJniBuild.scala b/project/SbtJniBuild.scala
index 99b693d..410b6a8 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-M4")
+ val scalaVersions: Seq[String] = List("2.11.8", "2.10.6", "2.12.0-M5")
val macrosParadiseVersion = "2.1.0"
val commonSettings = Seq(