From 23947312665b9c5b8b2c11caa18cb46b4d45b063 Mon Sep 17 00:00:00 2001 From: "Juan J. Martinez" Date: Tue, 21 Dec 2021 12:09:09 +0000 Subject: Formatted Moving scalafmt to the editor instead of on compile. --- build.sc | 81 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/build.sc b/build.sc index af85ead..8f0b67d 100644 --- a/build.sc +++ b/build.sc @@ -10,53 +10,54 @@ import mill.contrib.buildinfo.BuildInfo object server extends ScalaModule with ScalafmtModule with BuildInfo { def scalaVersion = "2.13.7" - def scalacOptions = Seq( - // features - "-encoding", "utf-8", - "-explaintypes", - "-language:higherKinds", - // warnings - "-deprecation", - "-Xlint:unused", - "-unchecked", - ) - - def ivyDeps = Agg( - ivy"ch.qos.logback:logback-classic:1.2.7", - ivy"com.github.pureconfig::pureconfig:0.17.1", - ivy"com.github.scopt::scopt:4.0.1", - ivy"com.typesafe.akka::akka-stream:2.6.17", - ivy"org.bouncycastle:bcprov-jdk15to18:1.69", - ivy"org.log4s::log4s:1.10.0" - ) - - override def compile = T { - reformat().apply() - super.compile() - } + def scalacOptions = + Seq( + // features + "-encoding", + "utf-8", + "-explaintypes", + "-language:higherKinds", + // warnings + "-deprecation", + "-Xlint:unused", + "-unchecked" + ) - val name = "spacebeans" - def buildInfoMembers: T[Map[String, String]] = T { - Map( - "name" -> name, - "version" -> VcsVersion.vcsState().format() + def ivyDeps = + Agg( + ivy"ch.qos.logback:logback-classic:1.2.7", + ivy"com.github.pureconfig::pureconfig:0.17.1", + ivy"com.github.scopt::scopt:4.0.1", + ivy"com.typesafe.akka::akka-stream:2.6.17", + ivy"org.bouncycastle:bcprov-jdk15to18:1.69", + ivy"org.log4s::log4s:1.10.0" ) - } + + val name = "spacebeans" + def buildInfoMembers: T[Map[String, String]] = + T { + Map( + "name" -> name, + "version" -> VcsVersion.vcsState().format() + ) + } def buildInfoPackageName = Some("net.usebox.gemini.server") - def assembly = T { - val version = VcsVersion.vcsState().format() - val spacePath = T.ctx.dest / (name + "-" + version + ".jar") - os.move(super.assembly().path, spacePath) - PathRef(spacePath) - } + def assembly = + T { + val version = VcsVersion.vcsState().format() + val spacePath = T.ctx.dest / (name + "-" + version + ".jar") + os.move(super.assembly().path, spacePath) + PathRef(spacePath) + } object test extends Tests with TestModule.ScalaTest with ScalafmtModule { def ivyDeps = Agg(ivy"org.scalatest::scalatest:3.2.10") - override def compile = T { - reformat().apply() - super.compile() - } + override def compile = + T { + reformat().apply() + super.compile() + } } } -- cgit v1.2.3