Scalafmt 2.7.5

joan38 · Dec 1, 2020 · 74118f7 · 74118f7
1 parent f83c98b
commit 74118f7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 2.7.3
+version = 2.7.5
 project.git = true
 maxColumn = 120
 align = more

diff --git a/build.sc b/build.sc
@@ -3,7 +3,7 @@ import $ivy.`com.goyeau::mill-scalafix:0.1.4`
 import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION`
 import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest:0.3.1`
 import $ivy.`io.github.davidgregory084::mill-tpolecat:0.1.4`
-import com.goyeau.mill.git.{GitVersionedPublishModule, GitVersionModule}
+import com.goyeau.mill.git.{GitVersionModule, GitVersionedPublishModule}
 import com.goyeau.mill.scalafix.StyleModule
 import de.tobiasroeser.mill.integrationtest._
 import io.github.davidgregory084.TpolecatModule
@@ -34,11 +34,10 @@ object `mill-scalafix`
       ivy"org.scala-lang.modules::scala-java8-compat:0.9.1"
     )
 
-  def buildInfoPackageName                     = Some("com.goyeau.mill.scalafix")
-  def buildInfoMembers: T[Map[String, String]] = T(Map("scalafixVersion" -> scalafixVersion))
+  override def buildInfoPackageName = Some("com.goyeau.mill.scalafix")
+  override def buildInfoMembers     = Map("scalafixVersion" -> scalafixVersion)
 
   override def publishVersion = GitVersionModule.version(withSnapshotSuffix = true)()
-  override def artifactName   = "mill-scalafix"
   def pomSettings =
     PomSettings(
       description = "A Scalafix plugin for Mill build tool",

diff --git a/mill-scalafix/src/com/goyeau/mill/scalafix/ScalafixModule.scala b/mill-scalafix/src/com/goyeau/mill/scalafix/ScalafixModule.scala
@@ -19,8 +19,7 @@ trait ScalafixModule extends ScalaModule {
   def scalafixIvyDeps: T[Agg[Dep]]          = Agg.empty[Dep]
   def scalafixScalaBinaryVersion: T[String] = "2.12"
 
-  /**
-    * Run Scalafix.
+  /** Run Scalafix.
     */
   def fix(args: String*): Command[Unit] =
     T.command {

diff --git a/mill-scalafix/src/com/goyeau/mill/scalafix/StyleModule.scala b/mill-scalafix/src/com/goyeau/mill/scalafix/StyleModule.scala
@@ -5,8 +5,7 @@ import mill.define.Command
 import mill.scalalib.scalafmt.ScalafmtModule
 import scala.annotation.nowarn
 
-/**
-  * Combine Scalafmt and Scalafix together
+/** Combine Scalafmt and Scalafix together
   */
 trait StyleModule extends ScalafmtModule with ScalafixModule {
   @nowarn("msg=pure expression does nothing")