diff --git a/build.sbt b/build.sbt index 34ec14849..27738322f 100644 --- a/build.sbt +++ b/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. diff --git a/project/FixScalafmtPlugin.scala b/project/FixScalafmtPlugin.scala deleted file mode 100644 index 35291e473..000000000 --- a/project/FixScalafmtPlugin.scala +++ /dev/null @@ -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, - ) -}