Skip to content

Commit fa630e3

Browse files
authored
Merge pull request #3512 from scala-steward-org/topic/update-mill-script-location
Use Mill script from `com-lihaoyi/mill` for the Docker image
2 parents 3522159 + 39d994f commit fa630e3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

build.sbt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ lazy val dummy = myCrossProject("dummy")
282282
.settings(noPublishSettings)
283283
.settings(
284284
libraryDependencies ++= Seq(
285+
Dependencies.millMain,
285286
Dependencies.scalaStewardMillPlugin
286287
)
287288
)
@@ -359,10 +360,10 @@ lazy val dockerSettings = Def.settings(
359360
s"tar -xf $sbtTgz",
360361
s"rm -f $sbtTgz"
361362
).mkString(" && ")
362-
val millVer = Dependencies.millwScriptVersion
363+
val millVer = Dependencies.millMain.revision
363364
val millBin = s"$binDir/mill"
364365
val installMill = Seq(
365-
s"$curl $millBin https://github.com/lefou/millw/releases/download/${millVer}/millw-${millVer}",
366+
s"$curl $millBin https://github.com/com-lihaoyi/mill/releases/download/$millVer/$millVer",
366367
s"chmod +x $millBin"
367368
).mkString(" && ")
368369
val csBin = s"$binDir/cs"

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 millwScriptVersion = "0.4.12"
36+
val millMain = "com.lihaoyi" % "mill-main_2.13" % "0.12.4"
3737
val monocleCore = "dev.optics" %% "monocle-core" % "3.3.0"
3838
val munit = "org.scalameta" %% "munit" % "1.0.3"
3939
val munitCatsEffect = "org.typelevel" %% "munit-cats-effect" % "2.0.0"

0 commit comments

Comments
 (0)