Merge pull request #5020 from eatkins/build-upgrade

Build upgrade

build.sbt

@@ -13,6 +13,7 @@ ThisBuild / version := {
 }
 ThisBuild / scalafmtOnCompile := !(Global / insideCI).value
 ThisBuild / Test / scalafmtOnCompile := !(Global / insideCI).value
+ThisBuild / turbo := true
 
 // ThisBuild settings take lower precedence,
 // but can be shared across the multi projects.
@@ -665,7 +666,6 @@ lazy val mainProj = (project in file("main"))
     sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
     testOptions in Test += Tests
       .Argument(TestFrameworks.ScalaCheck, "-minSuccessfulTests", "1000"),
-    Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat, // Delete this after 1.3.0-RC2.
     mimaSettings,
     mimaBinaryIssueFilters ++= Vector(
       // New and changed methods on KeyIndex. internal.

project/FixScalafmtPlugin.scala

@@ -1,23 +0,0 @@
-import sbt._
-import Keys._
-import org.scalafmt.sbt.ScalafmtPlugin
-import ScalafmtPlugin.autoImport._
-
-object FixScalafmtPlugin extends AutoPlugin {
-  override def requires = ScalafmtPlugin
-  override def trigger = allRequirements
-
-  val ScalaFmtTag = ConcurrentRestrictions.Tag("scalafmt")
-
-  override def globalSettings: Seq[Def.Setting[_]] =
-    Seq(
-      concurrentRestrictions += Tags.limit(ScalaFmtTag, 1)
-    )
-
-  override def projectSettings: Seq[Def.Setting[_]] =
-    Seq(
-      scalafmtCheckAll := (scalafmtCheckAll.tag(ScalaFmtTag)).value,
-      Compile / scalafmtCheck := ((Compile / scalafmtCheck).tag(ScalaFmtTag)).value,
-      Test / scalafmtCheck := ((Test / scalafmtCheck).tag(ScalaFmtTag)).value,
-    )
-}