Skip to content

Commit

Permalink
Mill, Scalafmt, Scalafix upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
joan38 committed Jan 12, 2022
1 parent 4eaafd4 commit 07d50fe
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.2.2
version = 3.3.1
runner.dialect = scala213source3
project.git = true
maxColumn = 120
Expand Down
10 changes: 4 additions & 6 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ import mill.scalalib.api.Util.scalaNativeBinaryVersion
import mill.scalalib.publish.{Developer, License, PomSettings, VersionControl}
import scalalib._

val millVersions = Seq("0.9.10", "0.10.0-M5")
val millVersions = Seq("0.9.12", "0.10.0-M5")
val millBinaryVersions = millVersions.map(scalaNativeBinaryVersion)

def millBinaryVersion(millVersion: String) = scalaNativeBinaryVersion(
millVersion
)
def millBinaryVersion(millVersion: String) = scalaNativeBinaryVersion(millVersion)

def millVersion(binaryVersion: String) =
millVersions.find(v => millBinaryVersion(v) == binaryVersion).get
Expand All @@ -31,7 +29,7 @@ class MillScalafixCross(millBinaryVersion: String)
with BuildInfo
with GitVersionedPublishModule {
override def millSourcePath = super.millSourcePath / os.up
override def artifactName = s"mill-scalafix_mill${millBinaryVersion}"
override def artifactName = s"mill-scalafix_mill$millBinaryVersion"
override def scalacOptions =
super.scalacOptions().filterNot(opt => millBinaryVersion.startsWith("0.10") && opt == "-Xfatal-warnings")
override def scalaVersion = "2.13.6"
Expand All @@ -40,7 +38,7 @@ class MillScalafixCross(millBinaryVersion: String)
ivy"com.lihaoyi::mill-main:${millVersion(millBinaryVersion)}",
ivy"com.lihaoyi::mill-scalalib:${millVersion(millBinaryVersion)}"
)
val scalafixVersion = "0.9.33"
val scalafixVersion = "0.9.34"
override def ivyDeps = super.ivyDeps() ++ Agg(
ivy"ch.epfl.scala:scalafix-interfaces:$scalafixVersion",
ivy"org.scala-lang.modules::scala-collection-compat:2.6.0",
Expand Down
2 changes: 1 addition & 1 deletion mill
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This is a wrapper script, that automatically download mill from GitHub release pages
# You can give the required mill version with MILL_VERSION env variable
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
DEFAULT_MILL_VERSION=0.9.10
DEFAULT_MILL_VERSION=0.9.12

set -e

Expand Down

0 comments on commit 07d50fe

Please sign in to comment.