diff options
| author | Zach Smith <zach@driver.xyz> | 2017-06-09 11:41:08 -0700 |
|---|---|---|
| committer | zachdriver <zach@driver.xyz> | 2017-06-20 13:36:27 -0700 |
| commit | ef6932b55eeed81f128682639b35f3d41b6fa4f2 (patch) | |
| tree | 680dcec71b6f9cc44f3f6d3af98e7a074e479142 | |
| parent | 49ecd082b34053fdca895aeb7057f79f143a81fa (diff) | |
| download | sbt-settings-ef6932b55eeed81f128682639b35f3d41b6fa4f2.tar.gz sbt-settings-ef6932b55eeed81f128682639b35f3d41b6fa4f2.tar.bz2 sbt-settings-ef6932b55eeed81f128682639b35f3d41b6fa4f2.zip | |
Try out new-sbt-scalafmt
| -rw-r--r-- | build.sbt | 3 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 64 |
3 files changed, 35 insertions, 34 deletions
@@ -7,7 +7,8 @@ scalaVersion := "2.10.6" publishMavenStyle := true // Code style plugins -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.6.8") +// 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 58f7a7f..2cfaba0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ // Code style plugins -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.6.6") +// 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 eedc8b9..a6f4bf2 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -31,38 +31,38 @@ object SbtSettings extends AutoPlugin { val JMX_PORT = 8686 object autoImport { - - lazy val scalafmtTest = taskKey[Unit]("scalafmtTest") - - lazy val formatSettings = { - val generateScalafmtConfTask = Def.task { - val scalafmtConfStream = getClass.getClassLoader.getResourceAsStream("scalafmt.conf") - val formatConfFile = file(".scalafmt.conf") - IO.write(formatConfFile, IO.readBytes(scalafmtConfStream)) - Seq(formatConfFile) - } - val generateScalafmtTask = Def.task { - val scalafmtStream = getClass.getClassLoader.getResourceAsStream("scalafmt") - val formatFile = file("scalafmt") - IO.write(formatFile, IO.readBytes(scalafmtStream)) - Seq(formatFile) - } - Seq( - resourceGenerators in Compile += generateScalafmtConfTask.taskValue, - resourceGenerators in Compile += generateScalafmtTask.taskValue, - scalafmtTest := { - s"chmod +x ${baseDirectory.value.getPath}/scalafmt".! - Thread.sleep(200L) - s"${baseDirectory.value.getPath}/scalafmt --test".! - }, - scalafmtTest in (Test, test) <<= - (scalafmtTest in (Test, test)) - .dependsOn(generateScalafmtConfTask, generateScalafmtTask), - testExecution in (Test, test) <<= - (testExecution in (Test, test)) - .dependsOn(generateScalafmtConfTask, generateScalafmtTask, scalafmtTest in Compile, scalafmtTest in Test) - ) - } + // + // lazy val scalafmtTest = taskKey[Unit]("scalafmtTest") + // + // lazy val formatSettings = { + // val generateScalafmtConfTask = Def.task { + // val scalafmtConfStream = getClass.getClassLoader.getResourceAsStream("scalafmt.conf") + // val formatConfFile = file(".scalafmt.conf") + // IO.write(formatConfFile, IO.readBytes(scalafmtConfStream)) + // Seq(formatConfFile) + // } + // val generateScalafmtTask = Def.task { + // val scalafmtStream = getClass.getClassLoader.getResourceAsStream("scalafmt") + // val formatFile = file("scalafmt") + // IO.write(formatFile, IO.readBytes(scalafmtStream)) + // Seq(formatFile) + // } + // Seq( + // resourceGenerators in Compile += generateScalafmtConfTask.taskValue, + // resourceGenerators in Compile += generateScalafmtTask.taskValue, + // scalafmtTest := { + // s"chmod +x ${baseDirectory.value.getPath}/scalafmt".! + // Thread.sleep(200L) + // s"${baseDirectory.value.getPath}/scalafmt --test".! + // }, + // scalafmtTest in (Test, test) <<= + // (scalafmtTest in (Test, test)) + // .dependsOn(generateScalafmtConfTask, generateScalafmtTask), + // testExecution in (Test, test) <<= + // (testExecution in (Test, test)) + // .dependsOn(generateScalafmtConfTask, generateScalafmtTask, scalafmtTest in Compile, scalafmtTest in Test) + // ) + // } lazy val testScalastyle = taskKey[Unit]("testScalastyle") |