Update build for Scala 2.12.15

ekrich · Sep 22, 2021 · d246717 · d246717
1 parent 7f4a720
commit d246717
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -18,17 +18,13 @@ def versionFmt(out: sbtdynver.GitDescribeOutput): String = {
   else nextVersion + "-SNAPSHOT"
 }
 
-val scalacOpts = List(
-  "-unchecked",
-  "-deprecation",
-  "-feature",
+val dotcOpts = List("-unchecked", "-deprecation", "-feature")
+val scalacOpts = dotcOpts ++ List(
   //"-Ywarn-unused:imports", // no 2.11 - maybe time for sbt-tpolecat
   "-Xsource:3"
   //"-Xlint:nonlocal-return" // no 2.11/2.12
 )
 
-val dotcOpts = List("-unchecked", "-deprecation", "-feature")
-
 Compile / console / scalacOptions --= Seq(
   "-Xlint:nonlocal-return", // for 2.12 console
   "-Ywarn-unused:imports",
@@ -43,7 +39,7 @@ val isScala3 = Def.setting {
 }
 
 val scala211 = "2.11.12"
-val scala212 = "2.12.14"
+val scala212 = "2.12.15"
 val scala213 = "2.13.6"
 val scala300 = "3.0.2"
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -15,4 +15,4 @@ addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % scalaNativ
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % crossVer)
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % scalaJSVersion)
 
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.30")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")