Skip to content

Commit

Permalink
Merge pull request #3512 from scala-steward-org/topic/update-mill-scr…
Browse files Browse the repository at this point in the history
…ipt-location

Use Mill script from `com-lihaoyi/mill` for the Docker image
  • Loading branch information
fthomas authored Dec 30, 2024
2 parents 3522159 + 39d994f commit fa630e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ lazy val dummy = myCrossProject("dummy")
.settings(noPublishSettings)
.settings(
libraryDependencies ++= Seq(
Dependencies.millMain,
Dependencies.scalaStewardMillPlugin
)
)
Expand Down Expand Up @@ -359,10 +360,10 @@ lazy val dockerSettings = Def.settings(
s"tar -xf $sbtTgz",
s"rm -f $sbtTgz"
).mkString(" && ")
val millVer = Dependencies.millwScriptVersion
val millVer = Dependencies.millMain.revision
val millBin = s"$binDir/mill"
val installMill = Seq(
s"$curl $millBin https://github.com/lefou/millw/releases/download/${millVer}/millw-${millVer}",
s"$curl $millBin https://github.com/com-lihaoyi/mill/releases/download/$millVer/$millVer",
s"chmod +x $millBin"
).mkString(" && ")
val csBin = s"$binDir/cs"
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ object Dependencies {
val jjwtApi = "io.jsonwebtoken" % "jjwt-api" % "0.12.6"
val jjwtImpl = "io.jsonwebtoken" % "jjwt-impl" % jjwtApi.revision
val jjwtJackson = "io.jsonwebtoken" % "jjwt-jackson" % jjwtApi.revision
val millwScriptVersion = "0.4.12"
val millMain = "com.lihaoyi" % "mill-main_2.13" % "0.12.4"
val monocleCore = "dev.optics" %% "monocle-core" % "3.3.0"
val munit = "org.scalameta" %% "munit" % "1.0.3"
val munitCatsEffect = "org.typelevel" %% "munit-cats-effect" % "2.0.0"
Expand Down

0 comments on commit fa630e3

Please sign in to comment.