aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2017-11-22 00:02:33 -0800
committerJakob Odersky <jakob@odersky.com>2017-11-22 00:02:33 -0800
commit28e4f17129b1d7c5028db6776b89db142af68bad (patch)
tree1e75dbb8054437f14d3f8242b2341ba49e122765
parent8c41ebd2da5c93bb8a101aebbb2c53f0cba35d44 (diff)
downloadsbt-jni-28e4f17129b1d7c5028db6776b89db142af68bad.tar.gz
sbt-jni-28e4f17129b1d7c5028db6776b89db142af68bad.tar.bz2
sbt-jni-28e4f17129b1d7c5028db6776b89db142af68bad.zip
Upgrade library, language and build tool versions
-rw-r--r--build.sbt2
-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--plugin/src/sbt-test/sbt-jni/simple/project/build.properties2
-rw-r--r--project/build.properties2
5 files changed, 5 insertions, 5 deletions
diff --git a/build.sbt b/build.sbt
index 0f1b328..a886c9b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
import scala.sys.process._
-val scalaVersions = Seq("2.12.3", "2.11.11", "2.10.6")
+val scalaVersions = Seq("2.12.4", "2.11.11", "2.10.6")
val macrosParadiseVersion = "2.1.0"
// version is derived from latest git tag
diff --git a/plugin/src/sbt-test/sbt-jni/simple/build.sbt b/plugin/src/sbt-test/sbt-jni/simple/build.sbt
index cd490b0..b6ee91b 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" % "test").
+ settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.2" % "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 c0b403a..27836f3 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.12.2", "2.11.11", "2.10.6"),
+ crossScalaVersions := Seq("2.12.4", "2.11.11", "2.10.6"),
scalaVersion := crossScalaVersions.value.head
)
diff --git a/plugin/src/sbt-test/sbt-jni/simple/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple/project/build.properties
index 7b6213b..9abea12 100644
--- a/plugin/src/sbt-test/sbt-jni/simple/project/build.properties
+++ b/plugin/src/sbt-test/sbt-jni/simple/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.1
+sbt.version=1.0.3
diff --git a/project/build.properties b/project/build.properties
index 7b6213b..9abea12 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.1
+sbt.version=1.0.3