aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2018-03-03 21:51:37 -0800
committerJakob Odersky <jakob@odersky.com>2018-03-03 21:53:47 -0800
commitdbdc35e081c74c0849462fa538d5eae57c06795b (patch)
treef10713b0001d115904fd614ecc3603bf4c6643cb
parent9da7f3c3d1de27f588f0113b65eea8ae9231497c (diff)
downloadsbt-jni-dbdc35e081c74c0849462fa538d5eae57c06795b.tar.gz
sbt-jni-dbdc35e081c74c0849462fa538d5eae57c06795b.tar.bz2
sbt-jni-dbdc35e081c74c0849462fa538d5eae57c06795b.zip
Upgrade sbt and scalav1.3.2
-rw-r--r--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
4 files changed, 4 insertions, 4 deletions
diff --git a/build.sbt b/build.sbt
index f33622f..78c82f7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
import scala.sys.process._
-val scalaVersions = Seq("2.12.4", "2.11.11", "2.10.6")
+val scalaVersions = Seq("2.12.4", "2.11.12", "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/project/ScriptedHelper.scala b/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala
index 27836f3..b3d7c70 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.4", "2.11.11", "2.10.6"),
+ crossScalaVersions := Seq("2.12.4", "2.11.12", "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 9abea12..31334bb 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.3
+sbt.version=1.1.1
diff --git a/project/build.properties b/project/build.properties
index 9abea12..31334bb 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.3
+sbt.version=1.1.1