Merge pull request #58 from DavidGregory084/derived-scalac-options

Make settings with dependencies into derived settings
typelevel · Mar 30, 2022 · f5a8426 · f5a8426
2 parents bda560f + ca22727
commit f5a8426
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/main/scala/io/github/davidgregory084/ScalacOption.scala b/src/main/scala/io/github/davidgregory084/ScalacOption.scala
@@ -36,4 +36,7 @@ class ScalacOption(
       case that: ScalacOption => this.tokens == that.tokens
       case _                  => false
     }
+
+  override def toString =
+    "ScalacOption(" + tokens.mkString(" ") + ")"
 }
diff --git a/src/main/scala/io/github/davidgregory084/TpolecatPlugin.scala b/src/main/scala/io/github/davidgregory084/TpolecatPlugin.scala
@@ -128,17 +128,28 @@ object TpolecatPlugin extends AutoPlugin {
   ) ++ commandAliases
 
   override def projectSettings: Seq[Setting[_]] = Seq(
-    scalacOptions              := scalacOptionsFor(scalaVersion.value, tpolecatScalacOptions.value),
-    tpolecatDevModeOptions     := ScalacOptions.default,
-    tpolecatCiModeOptions      := tpolecatDevModeOptions.value + ScalacOptions.fatalWarnings,
-    tpolecatReleaseModeOptions := tpolecatCiModeOptions.value + ScalacOptions.optimizerMethodLocal,
-    tpolecatScalacOptions := {
-      (ThisBuild / tpolecatOptionsMode).value match {
+    Def.derive(
+      scalacOptions := scalacOptionsFor(scalaVersion.value, tpolecatScalacOptions.value)
+    ),
+
+    tpolecatDevModeOptions := ScalacOptions.default,
+
+    Def.derive(
+      tpolecatCiModeOptions := tpolecatDevModeOptions.value + ScalacOptions.fatalWarnings
+    ),
+
+    Def.derive(
+      tpolecatReleaseModeOptions := tpolecatCiModeOptions.value + ScalacOptions.optimizerMethodLocal
+    ),
+
+    Def.derive(tpolecatScalacOptions := {
+      tpolecatOptionsMode.value match {
         case DevMode     => tpolecatDevModeOptions.value
         case CiMode      => tpolecatCiModeOptions.value
         case ReleaseMode => tpolecatReleaseModeOptions.value
       }
-    },
+    }),
+
     Compile / console / tpolecatScalacOptions ~= tpolecatConsoleOptionsFilter,
     Test / console / tpolecatScalacOptions ~= tpolecatConsoleOptionsFilter
   )