aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@drivergrp.com>2016-10-27 18:06:09 -0400
committervlad <vlad@drivergrp.com>2016-10-27 18:06:09 -0400
commit37d7e721b7e0e7a0a75a8abff2bbcf2912a433e0 (patch)
treee7764e52ad5e9865bcb52a1245ae105baf2255a8
parenteca4212f4846e88d6014dddd0a9de33aef7d7a85 (diff)
downloadsbt-settings-37d7e721b7e0e7a0a75a8abff2bbcf2912a433e0.tar.gz
sbt-settings-37d7e721b7e0e7a0a75a8abff2bbcf2912a433e0.tar.bz2
sbt-settings-37d7e721b7e0e7a0a75a8abff2bbcf2912a433e0.zip
Scalastyle in for src and test files
-rw-r--r--src/main/scala/xyz.driver.sbt/SbtSettings.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
index 5484806..3aaf79e 100644
--- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala
+++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
@@ -70,6 +70,7 @@ object SbtSettings extends AutoPlugin {
(testExecution in (Test, test)) dependsOn (scalafmtTest in Compile, scalafmtTest in Test))
private lazy val testScalastyle = taskKey[Unit]("testScalastyle")
+ testScalastyle := scalastyle.in(Test).toTask("").value
lazy val scalastyleSettings = Seq(
resourceGenerators in Test += Def.task {
@@ -193,9 +194,8 @@ object SbtSettings extends AutoPlugin {
Seq(styleFile)
}.taskValue,
scalastyleConfig := file("scalastyle-config.xml"),
- testScalastyle := org.scalastyle.sbt.ScalastylePlugin.scalastyle.in(Test).toTask("").value,
- testExecution in (Test, test) <<=
- (testExecution in (Test, test)) dependsOn (testScalastyle in Compile, testScalastyle in Test))
+ testScalastyle := scalastyle.in(Test).toTask("").value,
+ (test in Test) <<= (test in Test) dependsOn testScalastyle)
lazy val wartRemoverSettings = Seq(
wartremoverErrors in (Compile, compile) ++= Warts.allBut(