From 1c6c868ea555e0a4b3e738c6e77fde0d9bffbf88 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@driver.xyz>
Date: Thu, 24 Aug 2017 15:14:30 -0700
Subject: Move scalac linting options to default linting settings

This makes it easier to disable linting settings when debugging,
simply by commenting out lintingSettings. Previously,
`-Xfatal-warnings` also needed to be manually subtracted from
scalacOptions.
---
 src/main/scala/xyz.driver.sbt/SbtSettings.scala | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
index e81e85f..ca92f5f 100644
--- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala
+++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
@@ -88,7 +88,18 @@ object SbtSettings extends AutoPlugin {
         Wart.Equals
       ))
 
-    lazy val lintingSettings = scalastyleSettings ++ wartRemoverSettings
+    val scalacLintingSettings = Seq(
+      scalacOptions ++= Seq(
+        "-Xfatal-warnings",
+        "-Xlint:-missing-interpolator",
+        "-Ywarn-numeric-widen",
+        "-Ywarn-dead-code",
+        "-Ywarn-unused",
+        "-Ywarn-unused-import"
+      )
+    )
+
+    lazy val lintingSettings = scalacLintingSettings ++ scalastyleSettings ++ wartRemoverSettings
 
     lazy val repositoriesSettings: Seq[Setting[_]] = {
       Seq(
@@ -361,15 +372,6 @@ object SbtSettings extends AutoPlugin {
 
   val scalacDefaultOptions = Seq("-unchecked", "-deprecation", "-feature", "-Xlint", "-encoding", "utf8")
 
-  val scalacLintingOptions = Seq(
-    "-Xfatal-warnings",
-    "-Xlint:-missing-interpolator",
-    "-Ywarn-numeric-widen",
-    "-Ywarn-dead-code",
-    "-Ywarn-unused",
-    "-Ywarn-unused-import"
-  )
-
   val scalacLanguageFeatures = Seq(
     "-language:higherKinds",
     "-language:implicitConversions",
@@ -382,7 +384,7 @@ object SbtSettings extends AutoPlugin {
     organization := "xyz.driver",
     crossScalaVersions := List("2.11.11", "2.12.3"),
     scalaVersion := crossScalaVersions.value.head,
-    scalacOptions := (scalacDefaultOptions ++ scalacLanguageFeatures ++ scalacLintingOptions),
+    scalacOptions := (scalacDefaultOptions ++ scalacLanguageFeatures),
     scalacOptions in (Compile, console) := (scalacDefaultOptions ++ scalacLanguageFeatures),
     scalacOptions in (Compile, consoleQuick) := (scalacDefaultOptions ++ scalacLanguageFeatures),
     scalacOptions in (Compile, consoleProject) := (scalacDefaultOptions ++ scalacLanguageFeatures),
-- 
cgit v1.2.3