diff --git a/.mill-version b/.mill-version index 2d993c4..af88ba8 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.10.7 +0.11.1 diff --git a/build.sc b/build.sc index 27247ab..7654460 100644 --- a/build.sc +++ b/build.sc @@ -1,7 +1,7 @@ import $ivy.`com.lihaoyi::mill-contrib-bloop:` -import $ivy.`io.chris-kipp::mill-ci-release::0.1.1` -import $ivy.`io.github.davidgregory084::mill-tpolecat::0.3.0` -import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.6.1` +import $ivy.`io.chris-kipp::mill-ci-release::0.1.9` +import $ivy.`io.github.davidgregory084::mill-tpolecat::0.3.5` +import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.7.1` import de.tobiasroeser.mill.integrationtest._ import io.github.davidgregory084.TpolecatModule import io.kipp.mill.ci.release.CiReleaseModule @@ -21,11 +21,9 @@ trait BaseModule extends Module { trait BaseScalaModule extends TpolecatModule with BaseModule - with mill.scalalib.bsp.ScalaMetalsSupport with ScalafmtModule with CiReleaseModule { def scalaVersion = T.input("2.13.8") - def semanticDbVersion = T.input("4.4.34") def segmentsName = millModuleSegments.parts.mkString("-") @@ -47,8 +45,8 @@ trait BaseScalaModule object Dependencies { val osLib = ivy"com.lihaoyi::os-lib:0.8.1" val mill = Agg( - ivy"com.lihaoyi::mill-main:0.10.4", - ivy"com.lihaoyi::mill-main-api:0.10.4" + ivy"com.lihaoyi::mill-main:0.11.1", + ivy"com.lihaoyi::mill-main-api:0.11.1" ) } @@ -63,10 +61,10 @@ object `mill-plugin` extends BaseScalaModule { def moduleDeps = List(core) override def artifactSuffix: T[String] = - s"_mill0.10_${artifactScalaVersion()}" + s"_mill0.11_${artifactScalaVersion()}" object itest extends MillIntegrationTestModule { - def millTestVersion = "0.10.7" + def millTestVersion = "0.11.1" def pluginsUnderTest = Seq(`mill-plugin`) } } diff --git a/modules/mill-plugin/itest/src/01-check-formatted/build.sc b/modules/mill-plugin/itest/src/01-check-formatted/build.sc index eec4fab..5cfbf54 100644 --- a/modules/mill-plugin/itest/src/01-check-formatted/build.sc +++ b/modules/mill-plugin/itest/src/01-check-formatted/build.sc @@ -1,4 +1,4 @@ -import $exec.plugins +import $file.plugins import mill._ import mill.define.Command @@ -12,7 +12,7 @@ object nodir extends HeaderModule { def license: HeaderLicense = HeaderLicense.Apache2("2022", "lewisjkl") } -final case class FlatFile(path: os.Path, contents: String) +case class FlatFile(path: os.Path, contents: String) def flatFiles(p: os.Path): IndexedSeq[FlatFile] = { os.walk(p)