From ef6932b55eeed81f128682639b35f3d41b6fa4f2 Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Fri, 9 Jun 2017 11:41:08 -0700 Subject: Try out new-sbt-scalafmt --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 64 ++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'src') 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") -- cgit v1.2.3