Merge pull request #255 from armanbilge/issue/253

Revert #250 which moved scalac/javac options to scope-specific settings
typelevel · Apr 11, 2022 · 92bba13 · 92bba13
2 parents ce5ff67 + 99b4cc1
commit 92bba13
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala
@@ -195,10 +195,9 @@ object TypelevelSettingsPlugin extends AutoPlugin {
       "-encoding",
       "utf8",
       "-Xlint:all"
-    )
-  ) ++ inConfig(Compile)(perConfigSettings) ++ inConfig(Test)(perConfigSettings)
+    ),
 
-  private val perConfigSettings = Seq(
+    // TODO make these respect Compile/Test config
     scalacOptions ++= {
       if (tlFatalWarnings.value)
         Seq("-Xfatal-warnings")
@@ -237,7 +236,10 @@ object TypelevelSettingsPlugin extends AutoPlugin {
     },
     javacOptions ++= {
       withJdkRelease(tlJdkRelease.value)(Seq.empty[String])(n => Seq("--release", n.toString))
-    },
+    }
+  ) ++ inConfig(Compile)(perConfigSettings) ++ inConfig(Test)(perConfigSettings)
+
+  private val perConfigSettings = Seq(
     unmanagedSourceDirectories ++= {
       def extraDirs(suffix: String) =
         if (crossProjectPlatform.?.value.isDefined)