Upgrades scala and sbt versions

higherkindness · Jun 6, 2018 · e487ccc · e487ccc
1 parent e3ad7ef
commit e487ccc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
@@ -199,6 +199,8 @@ object ProjectPlugin extends AutoPlugin {
     // format: OFF
     scalaMetaSettings ++ sharedReleaseProcess ++ warnUnusedImport ++ Seq(
       libraryDependencies ++= commonDeps :+ %("slf4j-nop") % Test,
+      scalaVersion := "2.12.6",
+      crossScalaVersions := Seq("2.11.12", "2.12.6"),
       Test / fork := true,
       Tut / scalacOptions -= "-Ywarn-unused-import",
       orgAfterCISuccessTaskListSetting ~= (_.filterNot(_ == defaultPublishMicrosite)),

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.1.4
+sbt.version = 1.1.6