Skip to content

Commit 7ad1de4

Browse files
lefoumzuehlke
authored andcommitted
Replace com-lihaoyi/mill/mill script with lefou/millw/millw
The replaces the `mill` script from the Mill project with the dedicated `millw` porject. There is no version of the former script, that properly support all Mill version that Scala Steward can handle. The `lefou/millw` project supports all Mill version. Probably fix #3463
1 parent 74b1be4 commit 7ad1de4

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

build.sbt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -356,14 +356,10 @@ lazy val dockerSettings = Def.settings(
356356
s"tar -xf $sbtTgz",
357357
s"rm -f $sbtTgz"
358358
).mkString(" && ")
359-
val millVer = Dependencies.millScriptVersion
359+
val millVer = Dependencies.millwScriptVersion
360360
val millBin = s"$binDir/mill"
361-
val releasePageVersion = millVer.split("-") match {
362-
case Array(v, m, _*) if m.startsWith("M") => s"${v}-${m}"
363-
case Array(v, _*) => v
364-
}
365361
val installMill = Seq(
366-
s"$curl $millBin https://github.com/lihaoyi/mill/releases/download/${releasePageVersion}/$millVer",
362+
s"$curl $millBin https://raw.githubusercontent.com/lefou/millw/refs/tags/${millVer}/millw",
367363
s"chmod +x $millBin"
368364
).mkString(" && ")
369365
val csBin = s"$binDir/cs"

modules/core/src/main/scala/org/scalasteward/core/buildtool/mill/MillAlg.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ final class MillAlg[F[_]](defaultResolver: Resolver)(implicit
4646
)
4747

4848
private def runMill(buildRootDir: File) = {
49-
val command = Nel("mill", List("-i", "--import", cliPluginCoordinate, "show", extractDeps))
49+
val command = Nel("mill", List("--no-server", "--import", cliPluginCoordinate, "show", extractDeps))
5050
processAlg.execSandboxed(command, buildRootDir)
5151
}
5252
private def runMillUnder011(buildRootDir: File, millBuildVersion: Option[Version]) = {

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ object Dependencies {
3333
val jjwtApi = "io.jsonwebtoken" % "jjwt-api" % "0.12.6"
3434
val jjwtImpl = "io.jsonwebtoken" % "jjwt-impl" % jjwtApi.revision
3535
val jjwtJackson = "io.jsonwebtoken" % "jjwt-jackson" % jjwtApi.revision
36-
val millScriptVersion = "0.11.0-M10"
36+
val millwScriptVersion = "0.4.12"
3737
val monocleCore = "dev.optics" %% "monocle-core" % "3.3.0"
3838
val munit = "org.scalameta" %% "munit" % "1.0.2"
3939
val munitCatsEffect = "org.typelevel" %% "munit-cats-effect" % "2.0.0"

0 commit comments

Comments
 (0)