From dbdc35e081c74c0849462fa538d5eae57c06795b Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Sat, 3 Mar 2018 21:51:37 -0800 Subject: Upgrade sbt and scala --- build.sbt | 2 +- plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala | 2 +- plugin/src/sbt-test/sbt-jni/simple/project/build.properties | 2 +- project/build.properties | 2 +- 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 -- cgit v1.2.3