implement suggestions from review

Author: sideeffffect

build.sbt

@@ -1,6 +1,3 @@
-addCommandAlias("check", "; scalafmtSbtCheck; scalafmtCheckAll; compile:scalafix --check ; test:scalafix --check")
-addCommandAlias("fix", "; scalafmtSbt; scalafmtAll; compile:scalafix ; test:scalafix")
-
 ThisBuild / organization := "com.avast"
 ThisBuild / homepage := Some(url("https://github.com/avast/scala-server-toolkit"))
 ThisBuild / description := "Functional programming toolkit for building server applications in Scala."
@@ -11,47 +8,10 @@ ThisBuild / scalaVersion := "2.13.0"
 
 ThisBuild / turbo := true
 
-lazy val commonSettings = Seq(
+lazy val commonSettings = BuildHelper.settingsCommon ++ Seq(
   libraryDependencies ++= Seq(
-    compilerPlugin(Dependencies.kindProjector),
-    compilerPlugin(Dependencies.betterMonadicFor),
-    compilerPlugin(Dependencies.silencer),
-    compilerPlugin(scalafixSemanticdb), // for scalafix
-    Dependencies.silencerLib,
     Dependencies.catsEffect,
     Dependencies.Test.scalaTest % Test
-  ),
-  Compile / compile / wartremoverErrors ++= Warts.all filterNot Set(
-    Wart.Nothing, // keep, false positives all around
-    Wart.Overloading,
-    Wart.Any, // keep, false positives all around
-    Wart.Equals, // keep, easier that way
-    Wart.ToString, // keep, easier that way
-    Wart.Product, // keep, false positives all around
-    Wart.Serializable // keep, false positives all around
-  ),
-  ThisBuild / scalafixDependencies ++= Seq(
-    Dependencies.scalazzi // https://github.com/scalaz/scalazzi
-  ),
-  scalacOptions ++= Seq(
-    "-Yrangepos", // for scalafix. required by SemanticDB compiler plugin
-    "-Ywarn-unused", // for scalafix. not present in sbt-tpolecat for 2.13
-    "-P:silencer:checkUnused"
-  ),
-  scalacOptions --= {
-    if (!sys.env.contains("TRAVIS"))
-      Seq(
-        "-Xfatal-warnings" // for scala-fix https://scalacenter.github.io/scalafix/docs/rules/RemoveUnused.html
-      )
-    else
-      Seq()
-  },
-  Test / publishArtifact := false,
-  Test / test / wartremoverErrors := (Compile / compile / wartremoverErrors).value filterNot Set(
-    Wart.MutableDataStructures,
-    Wart.OptionPartial,
-    Wart.AsInstanceOf,
-    Wart.EitherProjectionPartial
   )
 )
 
@@ -108,3 +68,6 @@ lazy val pureconfig = project
     name := "scala-server-toolkit-pureconfig",
     libraryDependencies += Dependencies.pureConfig
   )
+
+addCommandAlias("check", "; scalafmtSbtCheck; scalafmtCheckAll; compile:scalafix --check ; test:scalafix --check")
+addCommandAlias("fix", "; scalafmtSbt; scalafmtAll; compile:scalafix ; test:scalafix")

project/BuildHelper.scala

@@ -0,0 +1,47 @@
+import sbt.Keys._
+import sbt._
+import scalafix.sbt.ScalafixPlugin.autoImport._
+import wartremover.WartRemover.autoImport._
+
+object BuildHelper {
+  lazy val settingsCommon = Seq(
+    libraryDependencies ++= Seq(
+      compilerPlugin(Dependencies.kindProjector),
+      compilerPlugin(Dependencies.silencer),
+      compilerPlugin(scalafixSemanticdb), // for scalafix
+      Dependencies.silencerLib
+    ),
+    Compile / compile / wartremoverErrors ++= Warts.all filterNot Set(
+      Wart.Nothing, // keep, false positives all around
+      Wart.Overloading,
+      Wart.Any, // keep, false positives all around
+      Wart.Equals, // keep, easier that way
+      Wart.ToString, // keep, easier that way
+      Wart.Product, // keep, false positives all around
+      Wart.Serializable // keep, false positives all around
+    ),
+    ThisBuild / scalafixDependencies ++= Seq(
+      Dependencies.scalazzi // https://github.com/scalaz/scalazzi
+    ),
+    scalacOptions ++= Seq(
+      "-Yrangepos", // for scalafix. required by SemanticDB compiler plugin
+      "-Ywarn-unused", // for scalafix. not present in sbt-tpolecat for 2.13
+      "-P:silencer:checkUnused"
+    ),
+    scalacOptions --= {
+      if (!sys.env.contains("TRAVIS"))
+        Seq(
+          "-Xfatal-warnings" // for scala-fix https://scalacenter.github.io/scalafix/docs/rules/RemoveUnused.html
+        )
+      else
+        Seq()
+    },
+    Test / publishArtifact := false,
+    Test / test / wartremoverErrors := (Compile / compile / wartremoverErrors).value filterNot Set(
+      Wart.MutableDataStructures,
+      Wart.OptionPartial,
+      Wart.AsInstanceOf,
+      Wart.EitherProjectionPartial
+    )
+  )
+}

project/Dependencies.scala

@@ -7,24 +7,22 @@ object Dependencies {
     val kindProjector = "0.10.3"
     val pureConfig = "0.12.0"
     val scalaTest = "3.0.8"
-    val zio = "1.0.0-RC13"
-    val zioInteropCats = "2.0.0.0-RC4"
-    val silencer = "1.4.3"
     val scalazzi = "0.1.3"
-    val betterMonadicFor = "0.3.1"
+    val silencer = "1.4.3"
     val slf4jApi = "1.7.28"
+    val zio = "1.0.0-RC13"
+    val zioInteropCats = "2.0.0.0-RC4"
   }
 
   val catsEffect = "org.typelevel" %% "cats-effect" % Versions.catsEffect
   val kindProjector = "org.typelevel" %% "kind-projector" % Versions.kindProjector
   val pureConfig = "com.github.pureconfig" %% "pureconfig" % Versions.pureConfig
+  val scalazzi = "com.github.vovapolu" %% "scaluzzi" % Versions.scalazzi
+  val silencer = "com.github.ghik" % "silencer-plugin" % Versions.silencer cross CrossVersion.full
+  val silencerLib = "com.github.ghik" % "silencer-lib" % Versions.silencer cross CrossVersion.full
   val slf4jApi = "org.slf4j" % "slf4j-api" % Versions.slf4jApi
   val zio = "dev.zio" %% "zio" % Versions.zio
   val zioInteropCats = "dev.zio" %% "zio-interop-cats" % Versions.zioInteropCats
-  val silencer = "com.github.ghik" % "silencer-plugin" % Versions.silencer cross CrossVersion.full
-  val silencerLib = "com.github.ghik" % "silencer-lib" % Versions.silencer cross CrossVersion.full
-  val scalazzi = "com.github.vovapolu" %% "scaluzzi" % Versions.scalazzi
-  val betterMonadicFor = "com.olegpy" %% "better-monadic-for" % Versions.betterMonadicFor
 
   object Test {