diff options
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 10 |
2 files changed, 5 insertions, 7 deletions
@@ -8,7 +8,7 @@ scalaVersion := "2.10.6" publishMavenStyle := true // Code style plugins -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.4.5") +addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.4.10") addSbtPlugin("org.wartremover" % "sbt-wartremover" % "1.0.1") addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 1e945ac..0d8a812 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -379,12 +379,10 @@ object SbtSettings extends AutoPlugin { override def projectSettings: Seq[Setting[_]] = Defaults.coreDefaultSettings ++ Seq ( organization := "xyz.driver", scalaVersion := "2.11.8", - scalacOptions in compile ++= (scalacDefaultOptions ++ scalacLanguageFeatures ++ scalacLintingOptions), - scalacOptions in test ++= (scalacDefaultOptions ++ scalacLanguageFeatures ++ scalacLintingOptions), - scalacOptions in IntegrationTest ++= (scalacDefaultOptions ++ scalacLanguageFeatures ++ scalacLintingOptions), - scalacOptions in console ++= (scalacDefaultOptions ++ scalacLanguageFeatures), - scalacOptions in consoleQuick ++= (scalacDefaultOptions ++ scalacLanguageFeatures), - scalacOptions in consoleProject ++= (scalacDefaultOptions ++ scalacLanguageFeatures), + scalacOptions := (scalacDefaultOptions ++ scalacLanguageFeatures ++ scalacLintingOptions), + scalacOptions in console := (scalacDefaultOptions ++ scalacLanguageFeatures), + scalacOptions in consoleQuick := (scalacDefaultOptions ++ scalacLanguageFeatures), + scalacOptions in consoleProject := (scalacDefaultOptions ++ scalacLanguageFeatures), libraryDependencies ++= Seq( "org.scalaz" %% "scalaz-core" % "7.2.4", "com.lihaoyi" %% "acyclic" % "0.1.4" % "provided" |