Skip to content

Support Mill 1 #3726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 15, 2025
+95 −9
Merged

Support Mill 1 #3726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a8c1294
Support Mill 1
lolgab Oct 4, 2025
7516ba3
Update mill-plugin to 0.19.0
lolgab Oct 13, 2025
23092e1
Add `build.sc` to files supporting mill yaml header
lolgab Oct 13, 2025
e49384b
Apply suggestions from code review
lolgab Oct 14, 2025
79dd490
Scalafmt
lolgab Oct 14, 2025
eff8226
fix: Fix MillAlg and MillAlgTest
lolgab Oct 15, 2025
0f5ee01
fix: Change order of file tests in BuildToolDispatcherTest
lolgab Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions modules/core/src/main/scala/org/scalasteward/core/buildtool/mill/MillAlg.scala
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MillAlgTest needs fix:

==> X org.scalasteward.core.buildtool.mill.MillAlgTest.getDependencies, version < 0.11  0.04s munit.ComparisonFailException: modules/core/src/test/scala/org/scalasteward/core/buildtool/mill/MillAlgTest.scala:32
31:    )
32:    assertEquals(state, expected)
33:  }
values are not the same
=> Diff (- expected, + obtained)
         "read",
-        "/tmp/scala-steward/workspace/lihaoyi/fastparse/.mill-version"
+        "/tmp/scala-steward/workspace/lihaoyi/fastparse/build.mill"
       )
         "read",
-        "/tmp/scala-steward/workspace/lihaoyi/fastparse/.config/mill-version"
+        "/tmp/scala-steward/workspace/lihaoyi/fastparse/build.mill.scala"
       )
       cmd = List(
+        "read",
+        "/tmp/scala-steward/workspace/lihaoyi/fastparse/build.sc"
+      )
+    ),
+    Cmd(
+      cmd = List(
         "write",
    at munit.FunSuite.assertEquals(FunSuite.scala:13)
    at org.scalasteward.core.buildtool.mill.MillAlgTest.$anonfun$new$1(MillAlgTest.scala:32)
==> X org.scalasteward.core.buildtool.mill.MillAlgTest.getDependencies, 0.11 <= version < 0.12  0.004s org.scalasteward.core.buildtool.mill.parser$CirceParseError: Failed to decode Modules
    at org.scalasteward.core.buildtool.mill.parser$.$anonfun$parseModules$1(parser.scala:43)
    at cats.syntax.EitherOps$.leftMap$extension(either.scala:193)
    at org.scalasteward.core.buildtool.mill.parser$.parseModules(parser.scala:43)
    at org.scalasteward.core.buildtool.mill.MillAlg.$anonfun$getProjectDependencies$1(MillAlg.scala:85)
    at cats.data.Kleisli.$anonfun$flatMap$4(Kleisli.scala:75)
    at set @ org.scalasteward.core.io.MockProcessAlg$.$anonfun$create$6(MockProcessAlg.scala:22)
    at blocking @ org.scalasteward.core.io.FileAlg$$anon$1.readResource(FileAlg.scala:111)
    at get @ org.scalasteward.core.io.MockProcessAlg$.$anonfun$create$2(MockProcessAlg.scala:15)
    at flatMap @ org.scalasteward.core.mock.package$.getFlatMapSet(package.scala:32)
    at flatMap @ org.scalasteward.core.mock.package$.getFlatMapSet(package.scala:32)
    at set @ org.scalasteward.core.io.MockProcessAlg$.$anonfun$create$6(MockProcessAlg.scala:22)
    at map @ org.scalasteward.core.io.MockProcessAlg$.$anonfun$create$14(MockProcessAlg.scala:37)
    at map @ org.scalasteward.core.io.MockProcessAlg$.$anonfun$create$7(MockProcessAlg.scala:23)
    at flatMap @ org.scalasteward.core.io.MockProcessAlg$.$anonfun$create$7(MockProcessAlg.scala:23)
    at set @ org.scalasteward.core.io.MockProcessAlg$.$anonfun$create$6(MockProcessAlg.scala:22)
Caused by: ParsingFailure: exhausted input

Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ final class MillAlg[F[_]](defaultResolvers: List[Resolver])(implicit
workspaceAlg.buildRootDir(buildRoot).flatMap(findBuildFile).map(_.nonEmpty)

private def findBuildFile(buildRootDir: File): F[Option[File]] =
List("build.sc", "build.mill", "build.mill.scala")
List("build.mill", "build.mill.scala", "build.sc")
.map(buildRootDir / _)
.findM(fileAlg.isRegularFile)

Expand Down Expand Up @@ -90,11 +90,23 @@ final class MillAlg[F[_]](defaultResolvers: List[Resolver])(implicit
override protected val scalafixIssue: Option[String] =
Some("https://github.com/scala-steward-org/scala-steward/issues/2838")

private def getMillVersion(buildRootDir: File): F[Option[Version]] =
List(
buildRootDir / s".$millVersionName",
buildRootDir / ".config" / millVersionName
).collectFirstSomeM(fileAlg.readFile).map(_.flatMap(parser.parseMillVersion))
private def getMillVersion(buildRootDir: File): F[Option[Version]] = {
val fromConfigFile =
List(
buildRootDir / s".$millVersionName",
buildRootDir / ".config" / millVersionName
).collectFirstSomeM(fileAlg.readFile(_).map(_.flatMap(parser.parseMillVersion)))
val fromBuildFile = List(
buildRootDir / "build.mill",
buildRootDir / "build.mill.scala",
buildRootDir / "build.sc"
).collectFirstSomeM(fileAlg.readFile(_).map(_.flatMap(parser.parseBuildFileMillVersion)))

fromBuildFile.flatMap {
case None => fromConfigFile
case some => F.pure(some)
}
}

private def getMillPluginDeps(
millVersion: Version,
Expand Down
6 changes: 6 additions & 0 deletions modules/core/src/main/scala/org/scalasteward/core/buildtool/mill/parser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ object parser {
def parseMillVersion(s: String): Option[Version] =
Option(s.trim).filter(_.nonEmpty).map(Version.apply)

private val millVersionRegex = """\s*\/\/\|\s*mill-version:\s*['"]?(.+?)['"]?\s*""".r
def parseBuildFileMillVersion(s: String): Option[Version] =
s.linesIterator.collectFirst { case millVersionRegex(version) =>
Version(version)
}

/** Used to correctly format the Mill plugin artifacts will when included look like:
* - import $ivy.`com.goyeau::mill-scalafix::0.2.10`
*
Expand Down
4 changes: 2 additions & 2 deletions modules/core/src/test/scala/org/scalasteward/core/buildtool/BuildToolDispatcherTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ class BuildToolDispatcherTest extends FunSuite {
val expectedState = initial.copy(trace =
Cmd("test", "-f", s"$repoDir/gradle/libs.versions.toml") +:
Cmd("test", "-f", s"$repoDir/pom.xml") +:
Cmd("test", "-f", s"$repoDir/build.sc") +:
Cmd("test", "-f", s"$repoDir/build.mill") +:
Cmd("test", "-f", s"$repoDir/build.mill.scala") +:
Cmd("test", "-f", s"$repoDir/build.sc") +:
Cmd("test", "-f", s"$repoDir/build.sbt") +:
allGreps ++:
Cmd("test", "-f", s"$repoDir/mvn-build/gradle/libs.versions.toml") +:
Cmd("test", "-f", s"$repoDir/mvn-build/pom.xml") +:
Cmd("test", "-f", s"$repoDir/mvn-build/build.sc") +:
Cmd("test", "-f", s"$repoDir/mvn-build/build.mill") +:
Cmd("test", "-f", s"$repoDir/mvn-build/build.mill.scala") +:
Cmd("test", "-f", s"$repoDir/mvn-build/build.sc") +:
Cmd("test", "-f", s"$repoDir/mvn-build/build.sbt") +:
allGreps ++:
Log("Get dependencies in . from sbt") +:
Expand Down
44 changes: 44 additions & 0 deletions modules/core/src/test/scala/org/scalasteward/core/buildtool/mill/MillAlgTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ class MillAlgTest extends FunSuite {
val state = millAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
val expected = initial.copy(
trace = Vector(
Cmd("read", s"$buildRootDir/build.mill"),
Cmd("read", s"$buildRootDir/build.mill.scala"),
Cmd("read", s"$buildRootDir/build.sc"),
Cmd("read", s"$buildRootDir/.mill-version"),
Cmd("read", s"$buildRootDir/.config/mill-version"),
Cmd("write", predef),
Expand Down Expand Up @@ -53,8 +56,13 @@ class MillAlgTest extends FunSuite {
val state = millAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
val expected = initial.copy(
trace = Vector(
Cmd("read", s"$buildRootDir/build.mill"),
Cmd("read", s"$buildRootDir/build.mill.scala"),
Cmd("read", s"$buildRootDir/build.sc"),
Cmd("read", s"$buildRootDir/.mill-version"),
millCmd,
Cmd("test", "-f", s"$buildRootDir/build.mill"),
Cmd("test", "-f", s"$buildRootDir/build.mill.scala"),
Cmd("test", "-f", s"$buildRootDir/build.sc"),
Cmd("read", s"$buildRootDir/build.sc")
)
Expand Down Expand Up @@ -84,15 +92,51 @@ class MillAlgTest extends FunSuite {
val state = millAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
val expected = initial.copy(
trace = Vector(
Cmd("read", s"$buildRootDir/build.mill"),
Cmd("read", s"$buildRootDir/build.mill.scala"),
Cmd("read", s"$buildRootDir/build.sc"),
Cmd("read", s"$buildRootDir/.mill-version"),
millCmd,
Cmd("test", "-f", s"$buildRootDir/build.mill"),
Cmd("test", "-f", s"$buildRootDir/build.mill.scala"),
Cmd("test", "-f", s"$buildRootDir/build.sc"),
Cmd("read", s"$buildRootDir/build.sc")
)
)
assertEquals(state, expected)
}

test("getDependencies, 1 <= version") {
val repo = Repo("mill-alg", "test-3")
val buildRoot = BuildRoot(repo, ".")
val buildRootDir = workspaceAlg.buildRootDir(buildRoot).unsafeRunSync()
val millCmd = Cmd.execSandboxed(
buildRootDir,
"mill",
"--no-server",
"--ticker",
"false",
"--import",
s"ivy:org.scala-steward::${BuildInfo.millPluginArtifactName}::${BuildInfo.millPluginVersion}",
"show",
extractDeps
)
val initial = MockState.empty
.copy(commandOutputs = Map(millCmd -> Right(List("""{"modules":[]}"""))))
.addFiles(buildRootDir / "build.mill" -> "//| mill-version: 1.0.6")
.unsafeRunSync()
val state = millAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
val expected = initial.copy(
trace = Vector(
Cmd("read", s"$buildRootDir/build.mill"),
millCmd,
Cmd("test", "-f", s"$buildRootDir/build.mill"),
Cmd("read", s"$buildRootDir/build.mill")
)
)
assertEquals(state, expected)
}

test("predef-content") {
assert(MillAlg.content(None).contains("_mill$MILL_BIN_PLATFORM"))
assert(MillAlg.content(Some(Version("0.6.1"))).contains("_mill0.6"))
Expand Down
24 changes: 24 additions & 0 deletions modules/core/src/test/scala/org/scalasteward/core/buildtool/mill/MillVersionParserTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,28 @@ class MillVersionParserTest extends FunSuite {
val parsed = parser.parseMillVersion(versionFileContent).map(_.value)
assertEquals(parsed, expected)
}

test(s"parse version from build.mill file") {
val buildMillFileContent = """
|//| mill-version: 1.0.5
|""".stripMargin
val parsed = parser.parseBuildFileMillVersion(buildMillFileContent).map(_.value)
assertEquals(parsed, Some("1.0.5"))
}

test(s"parse quoted version from build.mill file") {
val buildMillFileContent = """
|//| mill-version: "1.0.5"
|""".stripMargin
val parsed = parser.parseBuildFileMillVersion(buildMillFileContent).map(_.value)
assertEquals(parsed, Some("1.0.5"))
}

test(s"parse single quoted version from build.mill file") {
val buildMillFileContent = """
|//| mill-version: '1.0.5'
|""".stripMargin
val parsed = parser.parseBuildFileMillVersion(buildMillFileContent).map(_.value)
assertEquals(parsed, Some("1.0.5"))
}
}
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ object Dependencies {
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.19.0"
val scalaStewardMillPluginArtifactName = "scala-steward-mill-plugin"
val scalaStewardMillPlugin =
"org.scala-steward" % s"${scalaStewardMillPluginArtifactName}_mill0.11_2.13" % "0.18.2"
"org.scala-steward" % s"${scalaStewardMillPluginArtifactName}_mill1_3" % "0.19.0"
val tomlj = "org.tomlj" % "tomlj" % "1.1.1"
}