From c8c8eb2ade2084984be3c421701bb13b90af57ca Mon Sep 17 00:00:00 2001
From: Ethan Atkins <contact@ethanatkins.com>
Date: Sat, 31 Aug 2019 13:14:14 -0700
Subject: [PATCH 1/3] Delete unnecessary flat classloader strategy setting

---
 build.sbt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 34ec14849..d42f3c5e3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -665,7 +665,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.

From 97f59d20a0445de62e0c424d1307c410da2ac883 Mon Sep 17 00:00:00 2001
From: Ethan Atkins <contact@ethanatkins.com>
Date: Sat, 31 Aug 2019 13:27:01 -0700
Subject: [PATCH 2/3] Remove FixScalafmtPlugin

The underlying issue in https://github.com/scalameta/scalafmt/issues/1399
has supposedly been fixed in sbt-scalafmt 2.0.1 and we're on 2.0.2.
---
 project/FixScalafmtPlugin.scala | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 project/FixScalafmtPlugin.scala

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,
-    )
-}

From 4e1074d1754b31f85e7a96d7b96cd9b3fd16dd84 Mon Sep 17 00:00:00 2001
From: Ethan Atkins <contact@ethanatkins.com>
Date: Sat, 31 Aug 2019 13:37:01 -0700
Subject: [PATCH 3/3] Use turbo in sbt build

---
 build.sbt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.sbt b/build.sbt
index d42f3c5e3..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.