Skip to content

Commit 99b4cc1

Browse files
committed
Revert #250
1 parent ce5ff67 commit 99b4cc1

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,9 @@ object TypelevelSettingsPlugin extends AutoPlugin {
195195
"-encoding",
196196
"utf8",
197197
"-Xlint:all"
198-
)
199-
) ++ inConfig(Compile)(perConfigSettings) ++ inConfig(Test)(perConfigSettings)
198+
),
200199

201-
private val perConfigSettings = Seq(
200+
// TODO make these respect Compile/Test config
202201
scalacOptions ++= {
203202
if (tlFatalWarnings.value)
204203
Seq("-Xfatal-warnings")
@@ -237,7 +236,10 @@ object TypelevelSettingsPlugin extends AutoPlugin {
237236
},
238237
javacOptions ++= {
239238
withJdkRelease(tlJdkRelease.value)(Seq.empty[String])(n => Seq("--release", n.toString))
240-
},
239+
}
240+
) ++ inConfig(Compile)(perConfigSettings) ++ inConfig(Test)(perConfigSettings)
241+
242+
private val perConfigSettings = Seq(
241243
unmanagedSourceDirectories ++= {
242244
def extraDirs(suffix: String) =
243245
if (crossProjectPlatform.?.value.isDefined)

0 commit comments

Comments
 (0)