aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2017-04-27 10:11:14 -0700
committervlad <vlad@driver.xyz>2017-04-27 10:11:14 -0700
commit5151141b3b8d6dc1b4490b7156c9b259ae8d2684 (patch)
tree7957a6bbc89a9fc6b41129ad3e60b78cc2a65d21
parent8722406641337e37325bd89645a2fb749556ce0b (diff)
downloadsbt-settings-5151141b3b8d6dc1b4490b7156c9b259ae8d2684.tar.gz
sbt-settings-5151141b3b8d6dc1b4490b7156c9b259ae8d2684.tar.bz2
sbt-settings-5151141b3b8d6dc1b4490b7156c9b259ae8d2684.zip
Changing execution order for scalastyleSettings
-rw-r--r--src/main/scala/xyz.driver.sbt/SbtSettings.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
index cde6238..965a763 100644
--- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala
+++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
@@ -58,7 +58,7 @@ object SbtSettings extends AutoPlugin {
lazy val testScalastyle = taskKey[Unit]("testScalastyle")
lazy val scalastyleSettings = Seq(
- resourceGenerators in Test += Def.task {
+ resourceGenerators in Compile += Def.task {
val stream = getClass.getClassLoader.getResourceAsStream("scalastyle-config.xml")
val styleFile = file("scalastyle-config.xml")
IO.write(styleFile, IO.readBytes(stream))
@@ -66,7 +66,8 @@ object SbtSettings extends AutoPlugin {
}.taskValue,
scalastyleConfig := file("scalastyle-config.xml"),
testScalastyle := scalastyle.in(Compile).toTask("").value,
- (test in Test) <<= (test in Test) dependsOn testScalastyle)
+ testExecution in (Test, test) <<=
+ testExecution in (Test, test) dependsOn (testScalastyle in Compile, testScalastyle in Test))
lazy val wartRemoverSettings = Seq(
wartremoverErrors in (Compile, compile) ++= Warts.allBut(