diff options
author | Zach Smith <zach@driver.xyz> | 2017-06-20 11:31:17 -0700 |
---|---|---|
committer | zachdriver <zach@driver.xyz> | 2017-06-20 13:36:27 -0700 |
commit | 03b7a8c90774d02ac4796b42aa1cda9c274e93e2 (patch) | |
tree | a4bcfabd34449a62515e14baf3b0fd931445f53a | |
parent | 4ecd34365ef3921ba7f3c60547363356534aa27d (diff) | |
download | sbt-settings-03b7a8c90774d02ac4796b42aa1cda9c274e93e2.tar.gz sbt-settings-03b7a8c90774d02ac4796b42aa1cda9c274e93e2.tar.bz2 sbt-settings-03b7a8c90774d02ac4796b42aa1cda9c274e93e2.zip |
PR comments
-rw-r--r-- | project/plugins.sbt | 1 | ||||
-rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 41 |
2 files changed, 32 insertions, 10 deletions
diff --git a/project/plugins.sbt b/project/plugins.sbt index 3dc4a0d..f6e2ef2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,6 +2,7 @@ addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.0.3") addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.6") // Launch and deploy/release plugins addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0") diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index e1d31a9..d8df347 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -1,6 +1,6 @@ package xyz.driver.sbt -import com.lucidchart.sbt.scalafmt.ScalafmtCorePlugin.autoImport.scalafmt +import com.lucidchart.sbt.scalafmt.ScalafmtCorePlugin.autoImport._ import com.typesafe.sbt.SbtGit.git import com.typesafe.sbt.SbtNativePackager.autoImport._ import com.typesafe.sbt.packager.archetypes._ @@ -33,10 +33,22 @@ object SbtSettings extends AutoPlugin { object autoImport { lazy val formatSettings = { - test in Test := { - (test in scalafmt in Compile).value - (test in Test).value + val generateScalafmtConfTask = Def.task { + val scalafmtConfStream = getClass.getClassLoader.getResourceAsStream("scalafmt.conf") + val formatConfFile = file(".scalafmt.conf") + IO.write(formatConfFile, IO.readBytes(scalafmtConfStream)) + Seq(formatConfFile) } + + Seq( + resourceGenerators in Compile += generateScalafmtConfTask.taskValue, + scalafmt in Compile <<= (scalafmt in Compile).dependsOn(generateScalafmtConfTask), + test in scalafmt in Compile <<= (test in scalafmt in Compile).dependsOn(generateScalafmtConfTask), + test in Test := { + (test in scalafmt in Compile).value + (test in Test).value + } + ) } lazy val testScalastyle = taskKey[Unit]("testScalastyle") @@ -164,7 +176,7 @@ object SbtSettings extends AutoPlugin { // Check http://blog.byjean.eu/2015/07/10/painless-release-with-sbt.html for details releaseVersionBump := sbtrelease.Version.Bump.Bugfix, releaseVersion := { - case ver@snapshotVersion if snapshotVersion.endsWith("-SNAPSHOT") => + case ver @ snapshotVersion if snapshotVersion.endsWith("-SNAPSHOT") => Version(ver).map(_.withoutQualifier.string).getOrElse(versionFormatError) case ver => Version(ver).map(_.bumpBugfix.withoutQualifier.string).getOrElse(versionFormatError) @@ -299,13 +311,22 @@ object SbtSettings extends AutoPlugin { val allExposedPorts = exposedPorts ++ Seq(JMX_PORT) - dockerConfiguration(imageName, repositoryName, allExposedPorts, baseImage, dockerCommands, aggregateSubprojects) + dockerConfiguration(imageName, + repositoryName, + allExposedPorts, + baseImage, + dockerCommands, + aggregateSubprojects) .settings(NativePackagerKeys.bashScriptExtraDefines += importTrustStoreCommand) .settings(NativePackagerKeys.bashScriptExtraDefines += s"""addJava "-Dcom.sun.management.jmxremote"""") - .settings(NativePackagerKeys.bashScriptExtraDefines += s"""addJava "-Dcom.sun.management.jmxremote.port=$JMX_PORT"""") - .settings(NativePackagerKeys.bashScriptExtraDefines += s"""addJava "-Dcom.sun.management.jmxremote.local.only=false"""") - .settings(NativePackagerKeys.bashScriptExtraDefines += s"""addJava "-Dcom.sun.management.jmxremote.authenticate=false"""") - .settings(NativePackagerKeys.bashScriptExtraDefines += s"""addJava "-Dcom.sun.management.jmxremote.ssl=false"""") + .settings( + NativePackagerKeys.bashScriptExtraDefines += s"""addJava "-Dcom.sun.management.jmxremote.port=$JMX_PORT"""") + .settings( + NativePackagerKeys.bashScriptExtraDefines += s"""addJava "-Dcom.sun.management.jmxremote.local.only=false"""") + .settings( + NativePackagerKeys.bashScriptExtraDefines += s"""addJava "-Dcom.sun.management.jmxremote.authenticate=false"""") + .settings( + NativePackagerKeys.bashScriptExtraDefines += s"""addJava "-Dcom.sun.management.jmxremote.ssl=false"""") } def driverLibrary(libraryName: String): Project = { |