From c3a4fb1ea3fa92f593ece9632e58904884badc46 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Fri, 23 Aug 2024 13:31:28 +0200 Subject: [PATCH] Move build dependencies into meta build (#3412) Since we now have a meta build, we should manage all plugins in one place. Pull request: https://github.com/com-lihaoyi/mill/pull/3412 --- build.sc | 9 +-------- mill-build/build.sc | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/build.sc b/build.sc index 1bd7bccffc3..a2eb92e0b60 100644 --- a/build.sc +++ b/build.sc @@ -1,6 +1,4 @@ // imports -import $meta._ - import scala.util.chaining._ import com.github.lolgab.mill.mima.Mima import coursier.maven.MavenRepository @@ -20,14 +18,9 @@ import mill.T import mill.define.Cross // plugins and dependencies +import $meta._ import $file.ci.shared import $file.ci.upload -import $ivy.`org.scalaj::scalaj-http:2.4.2` -import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0` -import $ivy.`com.github.lolgab::mill-mima::0.1.1` -import $ivy.`net.sourceforge.htmlcleaner:htmlcleaner:2.29` -import $ivy.`com.lihaoyi::mill-contrib-buildinfo:` -import $ivy.`com.goyeau::mill-scalafix::0.4.0` object Settings { val pomOrg = "com.lihaoyi" diff --git a/mill-build/build.sc b/mill-build/build.sc index 7c61eaedd5b..ca37a51a485 100644 --- a/mill-build/build.sc +++ b/mill-build/build.sc @@ -1 +1,15 @@ -object build extends MillBuildRootModule \ No newline at end of file +import mill._ +import mill.runner.MillBuildRootModule +import mill.scalalib._ + +object build extends MillBuildRootModule { + override def ivyDeps = Agg( + ivy"org.scalaj::scalaj-http:2.4.2", + ivy"de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0", + ivy"com.github.lolgab::mill-mima::0.1.1", + ivy"net.sourceforge.htmlcleaner:htmlcleaner:2.29", + // TODO: implement empty version for ivy deps as we do in import parser + ivy"com.lihaoyi::mill-contrib-buildinfo:${mill.api.BuildInfo.millVersion}", + ivy"com.goyeau::mill-scalafix::0.4.0" + ) +}