aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Smith <zach@driver.xyz>2017-06-12 13:19:52 -0700
committerzachdriver <zach@driver.xyz>2017-06-20 13:36:27 -0700
commit044ff9e59b6a97cee7fc53f85504aa3ed14e80f4 (patch)
tree4ed21020eb48e9003f67e14869b77a8d31712eb9
parentaa06ea752b7f332b574192431f1d0390439fc40d (diff)
downloadsbt-settings-044ff9e59b6a97cee7fc53f85504aa3ed14e80f4.tar.gz
sbt-settings-044ff9e59b6a97cee7fc53f85504aa3ed14e80f4.tar.bz2
sbt-settings-044ff9e59b6a97cee7fc53f85504aa3ed14e80f4.zip
Add scalafmt to test
-rw-r--r--build.sbt1
-rw-r--r--project/plugins.sbt1
-rw-r--r--src/main/scala/xyz.driver.sbt/SbtSettings.scala8
3 files changed, 8 insertions, 2 deletions
diff --git a/build.sbt b/build.sbt
index 6e8eb6e..73f2552 100644
--- a/build.sbt
+++ b/build.sbt
@@ -7,7 +7,6 @@ scalaVersion := "2.10.6"
publishMavenStyle := true
// Code style plugins
-// addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.6.8")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "0.4")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.0.3")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 2cfaba0..3dc4a0d 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,4 @@
// Code style plugins
-// addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.6.6")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.0.3")
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 1a43975..e1d31a9 100644
--- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala
+++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
@@ -1,5 +1,6 @@
package xyz.driver.sbt
+import com.lucidchart.sbt.scalafmt.ScalafmtCorePlugin.autoImport.scalafmt
import com.typesafe.sbt.SbtGit.git
import com.typesafe.sbt.SbtNativePackager.autoImport._
import com.typesafe.sbt.packager.archetypes._
@@ -31,6 +32,13 @@ object SbtSettings extends AutoPlugin {
val JMX_PORT = 8686
object autoImport {
+ lazy val formatSettings = {
+ test in Test := {
+ (test in scalafmt in Compile).value
+ (test in Test).value
+ }
+ }
+
lazy val testScalastyle = taskKey[Unit]("testScalastyle")
lazy val scalastyleSettings = {