Merge pull request sbt#363 from eed3si9n/wip/bump_scala

Update to Scala 2.12.13 + 2.13.4

Author: eed3si9n

build.sbt

@@ -54,8 +54,9 @@ def commonSettings: Seq[Setting[_]] = Def.settings(
       case sv if sv.startsWith("2.10") =>
         old diff List("-Xfuture", "-Ywarn-unused", "-Ywarn-unused-import")
       case sv if sv.startsWith("2.11") => old ++ List("-Ywarn-unused", "-Ywarn-unused-import")
-      case sv if sv.startsWith("2.12") => old ++ List("-Ywarn-unused", "-Ywarn-unused-import", "-YdisableFlatCpCaching")
-      case _                           => old
+      case sv if sv.startsWith("2.12") =>
+        old ++ List("-Ywarn-unused", "-Ywarn-unused-import", "-YdisableFlatCpCaching")
+      case _ => old
     }
   },
   inCompileAndTest(
@@ -119,10 +120,6 @@ lazy val lmCore = (project in file("core"))
       scalaCheck % Test,
       scalaVerify % Test,
     ),
-    libraryDependencies ++= (scalaVersion.value match {
-      case v if v.startsWith("2.12.") => List(compilerPlugin(silencerPlugin))
-      case _                          => List()
-    }),
     libraryDependencies += scalaXml,
     resourceGenerators in Compile += Def
       .task(

core/src/test/scala/example/tests/CrossVersionCompatTest.scala

@@ -2,9 +2,9 @@ package example.tests
 
 import sbt.librarymanagement.{ CrossVersion, Disabled }
 import verify.BasicTestSuite
-import com.github.ghik.silencer.silent
+import scala.annotation.nowarn
 
-@silent
+@nowarn
 object CrossVersionCompatTest extends BasicTestSuite {
   test("CrossVersion.Disabled is typed to be Disabled") {
     assert(CrossVersion.Disabled match {

project/Dependencies.scala

@@ -3,13 +3,13 @@ import Keys._
 import sbt.contraband.ContrabandPlugin.autoImport._
 
 object Dependencies {
-  val scala212 = "2.12.12"
+  val scala212 = "2.12.13"
   val scala213 = "2.13.4"
 
   def nightlyVersion: Option[String] =
     sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version")
 
-  private val ioVersion = nightlyVersion.getOrElse("1.4.0")
+  private val ioVersion = nightlyVersion.getOrElse("1.5.0-M1")
   private val utilVersion = nightlyVersion.getOrElse("1.4.0")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
@@ -63,5 +63,4 @@ object Dependencies {
   }
   val gigahorseOkhttp = "com.eed3si9n" %% "gigahorse-okhttp" % "0.5.0"
   val okhttpUrlconnection = "com.squareup.okhttp3" % "okhttp-urlconnection" % "3.7.0"
-  val silencerPlugin = "com.github.ghik" %% "silencer-plugin" % "1.4.1"
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.5
+sbt.version=1.4.6