Use tpolecatSettings

sky-uk · Apr 18, 2022 · 58074cf · 58074cf
1 parent 95c61ca
commit 58074cf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -26,14 +26,16 @@ crossScalaVersions := supportedScalaVersions
 semanticdbEnabled  := true
 semanticdbVersion  := scalafixSemanticdb.revision
 
-ThisBuild / scalacOptions ++= Seq(
-  "-Xsource:3",
-  "-explaintypes"
-) ++ {
-  if (scalaBinaryVersion.value == "2.13") Seq("-Wconf:msg=annotation:silent") else Nil
+tpolecatScalacOptions ++= Set(ScalacOptions.source3)
+
+ThisBuild / scalacOptions ++= Seq("-explaintypes") ++ {
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, 13)) => Seq("-Wconf:msg=annotation:silent")
+    case _             => Nil
+  }
 }
 
-ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.6.0"
+ThisBuild / scalafixDependencies += Dependencies.Plugins.organizeImports
 
 Test / parallelExecution := false
 Test / fork              := true

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,6 +2,10 @@ import sbt._
 
 object Dependencies {
 
+  object Plugins {
+    val organizeImports = "com.github.liancheng" %% "organize-imports" % "0.6.0"
+  }
+
   object Akka {
     private val version = "2.6.18"
     val stream          = "com.typesafe.akka" %% "akka-stream"         % version